Merge proposals dependent on lp://staging/~stewart/percona-playback/cppcheck-fixes

lp://staging/~stewart/percona-playback/cppcheck-fixes has no merge proposals.