Made it possible to work with the 1.6 Crypto Merlin property tags

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