More updates to allow co-existence with ws-discovery

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