Merge changes from topic "expiration_pruning"

* changes:
  Adding additional call to delete expired keys
  Upgrade remotely provisioned keys if necessary.