mysql-test/t/rpl_charset.test:
  I have no idea why the automatic merge changed these, but now I have changed it back