Added missing Hibernate validator dependency.
Re-upgraded Spring to version 3.1.4.

This reverts commit 080e9159c0431abf53f3683ca24b668e9bcffb69.
Fixed strings for distributed status page. Removed setHeader() call that causes problems in Spring 3.1.
Got rid of dead Karaf and Jersey dependencies that were causing problems
when upgrading to Spring 3.1.
Merge branch 'master' of https://github.com/OpenNMS/opennms
Merge branch 'master' into features/spring-3.1
Merge remote-tracking branch 'origin/master' into features/spring-3.1
Merge remote-tracking branch 'origin/master' into features/spring-3.1
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 'features/spring-3.1' of https://github.com/OpenNMS/opennms into features/spring-3.1
Merge branch 'master' of https://github.com/OpenNMS/opennms
Merge branch 'master' into features/spring-3.1
Adjusted lock statements to avoid exception handling warnings.
Changed some keySet() iterations into more efficient valueSet() iterations.
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