PIM-3777 : re-work FieldNameBuilder and ProductValueNormalizer fixes