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

Keystore test updates
Merge pull request #570 from bhariharan/passcode

Add support for change passcode mode in UI