Merge proposals dependent on lp://staging/~landscape/charms/xenial/ubuntu/trunk

lp://staging/~landscape/charms/xenial/ubuntu/trunk has no merge proposals.