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

Updated patch to include additional URIPattern changes by @rdblue.
Could you add a test for `emptyConstraints.with("id", "a,b", "c") to make sure the URI encoding leaves one comma but correctly encodes the other one that is part of the data?