rpl.rpl_slave_grp_exec fails sporadically in buildbot with deadlock

rpl.rpl_slave_grp_exec 'stmt,xtradb'     w1 [ fail ]

        Test ended at 2016-08-05 05:03:52

CURRENT_TEST: rpl.rpl_slave_grp_exec

mysqltest: At line 149: query 'RENAME TABLE t3 TO t3_bak' failed: 1213: Deadlock found when trying to get lock; try restarting transaction

The result from queries just before the failure was:

< snip >

SELECT * FROM t1 ORDER BY a;

a	b

SELECT * FROM t2 ORDER BY a;

a	b

include/stop_slave_io.inc

RENAME TABLE t3_bak TO t3;

include/start_slave.inc

connection master;

TRUNCATE t1;

TRUNCATE t2;

TRUNCATE t3;

connection slave;

*** Test transactional group w/ PK ***

connection master;

ALTER TABLE t1 ENGINE=InnoDB;

ALTER TABLE t2 ENGINE=InnoDB;

ALTER TABLE t3 ENGINE=InnoDB;

connection slave;

RENAME TABLE t3 TO t3_bak;

More results from queries before failure can be found in /dev/shm/var/1/log/rpl_slave_grp_exec.log

 - saving '/dev/shm/var/1/log/rpl.rpl_slave_grp_exec-stmt,xtradb/' to '/dev/shm/var/log/rpl.rpl_slave_grp_exec-stmt,xtradb/'

Retrying test rpl.rpl_slave_grp_exec, attempt(2/3)...

worker[1] > Restart  - not started

worker[1] > Restart  - not started

***Warnings generated in error logs during shutdown after running tests: rpl.rpl_slave_grp_exec

2016-08-05  5:03:52 140166176916224 [Warning] Slave: Table 'test.t3' doesn't exist Error_code: 1146

2016-08-05  5:03:52 140166176916224 [Warning] Slave: Table 'test.t3' doesn't exist Error_code: 1146