after-merge fixes: test cases that were moved to extra/binlog_tests do not need to check for binlog being enabled