Merge changes from DITA-OT Ant scripts