INT-3182 Polishing - PR Comments

Extract PrimitiveWrapper->Primitive map to ClassUtils.