Merge proposals dependent on lp://qastaging/~gnuoy/charms/trusty/neutron-api/neutron-refactor

lp://qastaging/~gnuoy/charms/trusty/neutron-api/neutron-refactor has no merge proposals.