Merge branch 'stable-3.5' into stable-3.8

* stable-3.5:
  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: Iaa6d4a59d5cb26879500f2d36852eaa30efc5d7b
Release-Notes: skip