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

Updated patch to include additional URIPattern changes by @rdblue.
It would be good to have a URI test here as well that uses commas that are data and commas that are URI delimiters.