Merge "Remove the openvswitch special case upgrade code" into stable/ocata