Merge branch 'stable-3.1'

* stable-3.1:
  ReplicationQueueIT: Migrate to Flogger

Change-Id: I462606a4f237abaaddb07bbfd7f650020e0f3b43