Merge proposals dependent on lp://qastaging/~openstack-charmers/charms/trusty/odl-controller/next

lp://qastaging/~openstack-charmers/charms/trusty/odl-controller/next has no merge proposals.