Merge branch 'stable-3.10'

* stable-3.10:
  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: I3ce1519c44ec6cbae7725527ea626e55401cc488
Release-Notes: skip