Merge pull request #574 from khawkins/smartstore_keystore

Updating SmartStore encryption to key store-based
Testing DB upgrade and key store encryption changes