Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Fix minor nits in documentation of replication.maxRetries
  Fix replication retries when maxRetries is set to 0
  Set max retries to avoid queue congestion

Change-Id: Icf972f3df7d3d59925db670bc1f033028306d0c1