Description:
------------
MTR Ignores "--binlog-format" option but works correctly with
"--binlog_format".

Fix :
----------

Backport fixes for Bug#21609606 and Bug#22063875 to 5.7.

Cherry-Picked a commit f3f0b25dbd5acee6a9031e6a299042ded0fa7041 ,
bba670ef2962527dde1b316705ee6d730c00f880 , 7653439b6d8df6ed6a80ed3c19b749ab9a857ed3
on mysql-5.7

RB#23820

Reviewed-by : deepa.dixit@oracle.com
Reviewed-by : srikanth.b.r@oracle.com