Merge branch 'stable-3.2'

* stable-3.2:
  Fix naming for delay for draining the replication event queue

Change-Id: I00f99a78916e19a24e943981f1f857fafd8fd00e