Some bug fixes + enhancements surrounding derived keys

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