Merge proposals dependent on lp:~tvansteenburgh/charms/trusty/meteor/trunk

lp:~tvansteenburgh/charms/trusty/meteor/trunk has no merge proposals.