[CXF-4950] Minor code updates, preparing for the actual refctoring

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