The merge commit f2a94451
included some incorrect conflict resolution and left
an unused function wsrep_abort_slave_trx().

Also, we will clean up wsrep_innobase_kill_one_trx() a little.