Reverted change to require JDK 7 (JGRP-1880)