Recording .gitmergeinfo Changes
[CXF-5720,CXF-5721] Dealing with SQL percent and reserved chars, patches from Romain Castan applied