SOAP-697: Avoid the double encoded URIs
SOAP-697: Fixing in a better way
SOAP-697: Do not double encode URIs and do not miss to pass the userinfo along