Fixing a bug in loading MerlinDevice


Conflicts:
	src/main/java/org/apache/ws/security/components/crypto/CryptoFactory.java

git-svn-id: https://svn.apache.org/repos/asf/webservices/wss4j/branches/1_6_x-fixes@1620851 13f79535-47bb-0310-9956-ffa450edef68