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

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