Merge proposals dependent on lp://staging/~julian-edwards/launchpad/log-parser-logging-bug-691099

1. log-parser-logging-bug-691099
2. Dependent merge proposals