Merge branch 'stable-3.3' into stable-3.4

* stable-3.3:
  Allow using pull-replication on replica nodes

Change-Id: I3f41812325f6bba08924a074edc56bf90f791a12