Merge branch 'stable-3.12'

* stable-3.12:
  Do not notify failures on collisions
  Fixed erroneous increment of the rescheduled metric
  Ensure failures are only incremented in RunnableWithMetrics
  Move ProjectDeletionAction/CacheDeleteHandler PullReplicationModule

Change-Id: I2616c70936ed4a6169b3ebed062b202081740c8c