HORNETQ-1398 - fix broken tests and reintstate support for PKCS#11 keystores
Merge pull request #1827 from jbertram/master_HORNETQ-1398

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