HORNETQ-1398 - fix broken tests and reintstate support for PKCS#11 keystores