Merge "Make the openvswitch 2.4->2.5 upgrade more robust"