Merge proposals dependent on lp://qastaging/~bjornt/charms/trusty/neutron-api/next-r140-amulet-fixes

lp://qastaging/~bjornt/charms/trusty/neutron-api/next-r140-amulet-fixes has no merge proposals.