fix jre detection
more cleanup of smoke tests :P
Merge remote-tracking branch 'opennms/1.12'

Conflicts:
	smoke-test/src/test/java/org/opennms/smoketest/AdminPageTest.java