LPS-40911

Conflicts:
	build-test.xml
LPS-40911
LPS-40918 - Reverted "LPS-40115" to get rid of inconsistent TCK failures