Merge "Update plugins/replication and plugins/reviewnotes"