Issue #8475 by turegjorup: Updated build.xml