Reverted to lower tolerance and openjdk7=>oraclejdk7 in Travis.