Testing DB upgrade and key store encryption changes
Merge pull request #575 from khawkins/smartstore_keystore

Testing DB upgrade and key store encryption changes