Merge proposals dependent on lp:~laurynas-biveinis/percona-server/bug1247021

lp:~laurynas-biveinis/percona-server/bug1247021 has no merge proposals.