Merge branch '5.5-galera' into 10.0-galera

Conflicts:
	mysql-test/suite/galera/r/rpl_row_annotate.result
	sql/rpl_rli.cc
	sql/slave.cc
	sql/wsrep_applier.cc
	sql/wsrep_thd.cc