Refining a recent merge for security errors

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