ensure test order on JDK 1.7+
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java