Remove testng from build.xml
Merge branch 'master' into R30