[CXF-5806] Adding a patch from Romain Castan, and a temp disabled test