Recording .gitmergeinfo Changes
Backporting fix for CXF-5664
Recording .gitmergeinfo Changes