rename switch FIX_730_DPID_NOT_SET_CORRECTLY to NONBE_FIX_730_DPID_NOT_SET_CORRECTLY See merge request !1114