Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  ReplicationQueueIT: Migrate to Flogger

Change-Id: I5ea26f1ae8cbd538d284d750c07c45b38ed4e207