tune gradle build test JVM settings
fix travis build
fix failed travis test
Merge branch '2.3.x' into 2.4.x

Conflicts:
	build.gradle