fix avian-unittest openjdk-src build
Keep java.net.SocketTimeoutException for OpenJDK
Merge remote-tracking branch 'github/master' into dicej

Conflicts:
	makefile