Merge proposals dependent on lp://staging/~hopem/charms/trusty/neutron-api/lp1518975

lp://staging/~hopem/charms/trusty/neutron-api/lp1518975 has no merge proposals.