Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  ReplicationQueueIT: Migrate to Flogger

Change-Id: I4e2959099df497e661d3b26b4c6d286e9b52a502