Merge proposals dependent on lp://qastaging/~stewart/percona-xtrabackup/bug1213036

lp://qastaging/~stewart/percona-xtrabackup/bug1213036 has no merge proposals.