NMS-6327, Add check in ISOMLayoutAlgorithm for vertex count
No longer rely on opennms-base-assembly for datacollection config tests.

Conflicts:
	opennms-config/src/test/java/org/opennms/netmgt/config/DataCollectionConfigParserTest.java
Merge branch 'space/13.2'