[CXF-5825] Fix the "verbose" logic in the tools
[CXF-5783] Fix client code generation
Recording .gitmergeinfo Changes