Merge proposals dependent on lp://qastaging/~fginther/landscape-charm/add-tools-ci-test

lp://qastaging/~fginther/landscape-charm/add-tools-ci-test has no merge proposals.