Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev