Merged from trunk r1736922: Ensure a ModelField is set for rhs EntityConditionValues that don't already have it, such as the EntityFunction classes