[CXF-6053] Applying a second part of the modified patch on behalf of Daniel Torkian and Luigi Lo Iacono