Post-post-push fix. The result file for rpl_rbr_to_sbr needs to be 
updated. While I was there, made rpl_rbr_to_sbr clean up after itself
by reverting @@binlog_format to the value it had before the test
started.


mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
  Updated result file
mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test:
  Made the test clean up after itself by reverting @@binlog_format
  to its original value.