Cherrypicked fix for NMS-5845 from master to 1.11.91-SNAPSHOT

Squashed commit of the following:

commit 0b7bf78b1a0777c888e4904bbe1090c27f0ea47b
Author: Ronny Trommer <ronny@opennms.org>
Date:   Sat May 11 18:02:11 2013 +0200

    Fix JUnit test for parsing datacollection configuration. The fix for NMS-5845 in commit 19c39d84e4fd38849f49bec5b42b824dac199f6b reduced the amount of resourceTypes by 10.

commit 3716f0445eaf55e149a843d2401d1876051ad41b
Author: Christian Pape <Christian.Pape@informatik.hs-fulda.de>
Date:   Fri May 10 23:12:08 2013 +0200

    Fixed single/multi instance bug in VmwareCollector NMS-5845
Release Notes for Release 1.10.10
1.10.10-SNAPSHOT -> 1.10.10
Merge branch '1.10' of https://github.com/OpenNMS/opennms into 1.10
Fix NMS-5900 (postevent.jsp redirects to a missing page)
1.10.10 -> 1.10.11-SNAPSHOT
fix OSGI version
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'

Conflicts:
	pom.xml