Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  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: I04a66d80e6db00bf2d6e7c0000a9c40905f9220c