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
Revert "Revert "various fixes for sonar issues""

This reverts commit 687dbeb92870b0003afb5c2eb7573cf42a730263.
Revert "Revert "NPE checks""

This reverts commit e1cbe2d11a2b8872ea7043687c8a1095ec22d5ba.
Merge remote-tracking branch 'origin/master' into features/sonar-cleanup
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
don't do soyc reports when gwt compiling vaadin apps
speed up GWT compiles by collapsing properties
bump GWT to 2.5.1
bomb early if required exes are missing
NMS-6068 fix opennms status return code when not configured
maven 3.0.3 -> 3.0.5
always renice ourselves if we can
pom work: Fix xml encoding type: MACROMAN -> UTF-8
pom work: Fix xml encoding type: UTF8 -> UTF-8
NMS-6076 use data tmp directory for the JVM