Unit test demonstrating NMS-6592
Add an Ordering object to EventConf events so they can be sorted by the order they occur in the files before comparing
Merge remote-tracking branch 'origin/jira/NMS-6592' into 1.12
Merge remote-tracking branch 'origin/1.12' into rc/stable/1.14.0

Conflicts:
	opennms-config/src/main/java/org/opennms/netmgt/config/DefaultEventConfDao.java