Merge proposals dependent on lp://qastaging/~billy-olsen/charms/trusty/ceilometer/lp1541618

lp://qastaging/~billy-olsen/charms/trusty/ceilometer/lp1541618 has no merge proposals.