Merge proposals dependent on lp://qastaging/~james-page/charms/trusty/neutron-api/ipv6-fixes

lp://qastaging/~james-page/charms/trusty/neutron-api/ipv6-fixes has no merge proposals.