Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: ReplicationQueue: Revert back from Flogger to slf4j logging Change-Id: I05d565e2d45154f72b8efed6579a10bca892de9d