CSS fix for NMS-5865
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
Fixed single/multi instance bug in VmwareCollector NMS-5845
Merge branch 'master' of github.com:OpenNMS/opennms
added @override to opennms-services
added all missing @override annotations
removed unused imports
Fix JUnit test for parsing datacollection configuration. The fix for NMS-5845 in commit 19c39d84e4fd38849f49bec5b42b824dac199f6b reduced the amount of resourceTypes by 10.
Fix of issue #SPC-570
Merge branch 'master' of github.com:OpenNMS/opennms
CSS fix for NMS-5865
Merge branch '1.12'
Revert "CSS fix for NMS-5865"

This reverts commit 7c46a65d026a24817aacbe442ab3195820ffcc0f.
NMS-5865 fix favicon link rel messing up stylesheet interpretation
Merge branch '1.12'
Fixed sorting on node label by joining with node property of OnmsAlarm.
Changed to Java5 for-loop syntax.
Another fix for NMS-5733 (event-acking checkboxes render by default)
Refactored servlet so that it no longer uses unreliable instance
variables.
Rename XMP artifact (Xmp to xmp) and bump version to 1.30r1