25527 Add upgrade testing for 7.x-1.x branch
25527 Fixes bad merge of build.xml
Merge pull request #211 from previousnext/25527-test-upgrades-1.x

25527 Add upgrade testing for 7.x-1.x branch
25555 Set default dir for contrib