[CXF-4851] Improving the way UriBuilder handles encoding in case of build() calls

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