This completes r1549016
It's not pretty, but with Adrian's introduction of OfbizUrlBuilder class in trunk, this will be the only version with this scheme.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1549781 13f79535-47bb-0310-9956-ffa450edef68