- fix up ConvertToEnumOrNull to return null when string enumValue is null