Merge proposals dependent on lp:~percona-toolkit-dev/percona-toolkit/fix-osc-bug-897483-and-bug-925007

1. fix-osc-bug-897483-and-bug-925007
2. Dependent merge proposals