Updating SmartStore encryption to key store-based

Here's the follow-up to the last PR, which actually updates the encryption of each SmartStore from whatever it was to be key store-based.  The tests still need to be fixed, but this is otherwise functioning.