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

Updated patch to incorporate feedback on original pull request (https://github.com/kite-sdk/kite/pull/204).