CDK-664: Fix constraint over-encoding in view URIs

Updated patch to include additional URIPattern changes by @rdblue.