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

Updated patch to include additional URIPattern changes by @rdblue.
Does it work with fewer changes here? Maybe just concatenate:
```java
return new URI(isView ? VIEW_SCHEME : DATASET_SCHEME + ":" + pattern.construct(options).toString());
```