(MNG-5717) Enrich toolchain xml with merge information
update Ant script as well