Issue #5803: Update build.xml