Update replication plugin with merge from stable-2.11

Change-Id: I158b4f5b7f82a5e1bdeee64aec78c25d01478829
This commit is contained in:
David Pursehouse
2015-11-12 17:53:07 -08:00
parent e7eeacbf9e
commit 291fcd26f0