Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  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: I8f8bd4fdfa715079493975627a3bc13a96110060