[CXF-5688] Ninor adjustments to the enum conversion code