Fix typo in SnmpAgentConfig.toString()
NMS-6821: Notification wizard should hide events with donotpersist or auto-clean=true

Move all such events into a disabled optgroup to give a solid indication that they
are ineligible.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-webapp/src/main/webapp/admin/notification/noticeWizard/chooseUeis.jsp
skip latest JDK7 if we have already found an older one
only use the numeric part of the build number
if $JAVA_HOME is invalid, fall back to searching
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	bin/functions.pl
Merge remote-tracking branch 'origin/master' into pjsm/2.0