Merge "Update replication plugin to latest revision" into stable-2.9