more temporary databases for jdk 7
Merge branch '1.12'

Conflicts:
	opennms-webapp/src/test/java/org/opennms/web/alarm/AlarmRepositoryTest.java
Merge branch 'master' into pull-requests