Merging test-branch with classpath ant build fixes