Merge proposals dependent on lp://qastaging/~percona-dev/percona-server/5.1.54-move-and-simplify-innodb_deadlock_count-tests

1. 5.1.54-move-and-simplify-innodb_deadlock_count-tests
2. Dependent merge proposals