Merge proposals dependent on lp://staging/~stewart/percona-server/bug693415

lp://staging/~stewart/percona-server/bug693415 has no merge proposals.