Merge "Update replication plugin to get fixes for IT flakiness" into stable-3.1