Merge proposals dependent on lp://staging/~dpb/landscape-charm/deploy

lp://staging/~dpb/landscape-charm/deploy has no merge proposals.