Backport replication2_console_tests to 1.4