Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  pull-replication plugin isn't implemented in v3.0

Change-Id: I4d44eebc639d3934050be3aa732fbd605df470a9