Update ant build for python unit tests
Merge branch '4.3'

The conflict exists because I made the same change on both
branches.

Conflicts:
	build.xml