Merge branch 'stable-3.8' into stable-3.10

* stable-3.8:
  PushOne: Remove unused addRef() method
  TasksStorage: Remove synchronized from methods
  Place the replaying flag clearing in a finally
  Demote delete errors when distributor is enabled
  distributor: Reduce log level for no-op consolidations

Change-Id: I15eb65d0f379a6e562d3c86e1089cfb7d9e6752c
Release-Notes: skip