Merge "New replication config default in 2.9 Release Notes"