More SecureConveration changes, already applied on 2.7.x + 2.6.x

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