Manually merged  mysql-5.5 into mysql-5.6

CONFLICTS
=========

Text conflict in mysql-test/suite/rpl/r/rpl_stop_slave.result
Text conflict in mysql-test/suite/rpl/t/rpl_stop_slave.test