MC-46: Fix and update build.xml