Fixing a keystore state issue on encryption key change
Merge pull request #808 from khawkins/fix_keystore

Fixing a keystore state issue on encryption key change