Merge change 9437 into donut

* changes:
  Reduce the number of keystore connections.