Merge changes I98272fb0,I1ce8ca51

* changes:
  Keystore 2.0: No longer transition to database directory.
  Keystore 2.0: Make per boot database an in memory db.