Merge branch 'stable-2.14'

* stable-2.14:
  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: I303d3b471bc98eaead33cfa49d614b176cf34f58