Merge proposals dependent on lp://qastaging/~ahasenack/landscape-charm/include-arbitrary-files-in-collected-logs

1. include-arbitrary-files-in-collected-logs
2. Dependent merge proposals