ignore "resources"
OPENNMS-NMS1-COMPILE-46 fix for missing ops4j pax vaadin dependency
duh, there was already one there :)
fix for OPENNMS-NMS-RPM-68, yet ANOTHER vaadin repository issue
SPC-711 fix; Update OSGiUpdateManager to pass VertexRefs
Merge branch 'space/13.1-P2' into space/13.2

Conflicts:
	features/topology-map/org.opennms.features.topology.api/src/main/java/org/opennms/features/topology/api/support/BlueprintIViewContribution.java
	features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/TopologyUI.java
	features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/AlarmDaoContainer.java
	features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/src/main/java/org/opennms/features/topology/plugins/browsers/NodeDaoContainer.java
	features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/src/main/java/org/opennms/features/topology/plugins/ncs/SelectionTreeFactory.java
fix more merge conflicts