Major build-test.xml changes (master-qa-4062)

http://issues.liferay.com/browse/LIFERAYQA-4062