Merge proposals dependent on lp://staging/~openstack-charmers/charms/precise/neutron-api/old-1410

lp://staging/~openstack-charmers/charms/precise/neutron-api/old-1410 has no merge proposals.