Merge branch 'stable-3.4' into stable-3.5

* stable-3.4:
  Fix pull-replication plugin startup which was always failing
  Add description for pending tasks metric
  Add description for in_flight metric
  Fixed typo in metric description

Change-Id: Ie977b4d114d11ac63b307f57e541dc7f16274fb1