Merge changes Ieeb0ebef,I1f33a8c6,I07168a7b

* changes:
  Add a specific error code for keystore failure
  Add a specific error code for provider mismatches
  Report the true value of more RoR metrics