Bullet proofing multi-threaded keystore access
Merge pull request #569 from khawkins/keystore_test_updates

Keystore test updates