SOAP-697: Avoid the double encoded URIs
Merge branch 'double-encoded-uris-SOAP-697-next' into ready-for-testing