Merge changes I910e3d60,If1cdbe8e,I1d1b6983

* changes:
  Rename keystore.{h|cpp} to KeyStore.{h|cpp}
  Refactor OperationMap interface.
  Small refactor to clarify auth token ownership.