Merge proposals dependent on lp://qastaging/~fginther/landscape-client/fix-missing-install-dirs

lp://qastaging/~fginther/landscape-client/fix-missing-install-dirs has no merge proposals.