Merge branch 'stable-2.11' * stable-2.11: Add waiting time and number of retries to replication log Change-Id: If98f8917071715b0d5823a0afa8ceee82c8be723