fixes and cleanups


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