Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Ic5fc0b8c0ca4e3d2c4d0706fe013c752b831fcb7