[CXF-5948] Few more modifications