Merge proposals dependent on lp://qastaging/~gnuoy/charms/trusty/openvswitch-odl/duplicate-controllers

lp://qastaging/~gnuoy/charms/trusty/openvswitch-odl/duplicate-controllers has no merge proposals.