Merging a tidied up version of Marc's SwA patch

git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/trunk@1540770 13f79535-47bb-0310-9956-ffa450edef68