WICKET-5211 Make CryptoMapper extendable
Java 7 diamond operator. Remove unused method