Merge changes from topic "keystore2-metrics"

* changes:
  Add support for keystore2 storage metrics
  Update PropertyWatcher to wait for property create