uncomment no-longer-failing test

no clue when or how this got fixed, but it now works
(on both Tortoise and Nashorn)
specify exact JDK version in Travis config

oraclejdk7 is actually the default, but it's best to make it
explicit, for documentation, and in case Travis changes the
default
Merge branch 'master' into nashorn

Conflicts:
	.travis.yml