[CXF-5007] UriBuilder updates to get some edge-case tests passing

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1480593 13f79535-47bb-0310-9956-ffa450edef68