[CXF-5508] More fixes based on the feedback from Jan Engehausen

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