Merge proposals dependent on lp://staging/~michael.nelson/launchpad/588288-log-parser-dont-read-entire-file-qa

1. 588288-log-parser-dont-read-entire-file-qa
2. Dependent merge proposals