[WSS-430] - Merging a tidied up version of Marc's SwA patch

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