Merge proposals dependent on lp://qastaging/~openstack-charmers-archive/charms/trusty/openvswitch-odl/trunk

lp://qastaging/~openstack-charmers-archive/charms/trusty/openvswitch-odl/trunk has no merge proposals.