Merge changes from topic "ic-rkp"

* changes:
  Add support for RKP to credstore
  Refactor RKP key pool in keystore