Merge proposals dependent on lp://staging/~benji/landscape-client/bug-1546743-postinst-creates-file-in-non-existent-directory

1. bug-1546743-postinst-creates-file-in-non-existent-directory
2. Dependent merge proposals