25527 Fixes bad merge of build.xml