The merge log entry things are no longer appicable with git based merges
Update to the latest Woodstox releases
Update the Blueprint parsing for JAXB objects to allow propertly placeholders.
Recording .gitmergeinfo Changes