Merge proposals dependent on lp://staging/~akopytov/percona-server/5.6-tp_fixes

lp://staging/~akopytov/percona-server/5.6-tp_fixes has no merge proposals.