Merge branch 'master' of github.com:OpenNMS/opennms
Code cleanup and some NPE prevention.
Revert "NPE checks"

This reverts commit c328f2bad22075d46a5dcaae9878d250a8839f5a.
Revert "various fixes for sonar issues"

This reverts commit 1d0947bd88e9deb8ab17fc9b357b1b502902b686.
Revert "Revert "various fixes for sonar issues""

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

This reverts commit e1cbe2d11a2b8872ea7043687c8a1095ec22d5ba.
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
Fix for Bug NMS-6075
Entity, icons, Controller and such are added to provide implemenation for user-based filters
Fix for Bug NMS-6024
Revert "Revert "Added missing Hibernate validator dependency.""

This reverts commit 6bc4514d42fbc9ad3bb005484d688d60a877dc86.
Merge remote-tracking branch 'origin/master' into features/sonar-cleanup
Fix for Bug NMS-6080
Fix for Bug NMS-6077
Adjusted lock statements to avoid exception handling warnings.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java
Fix for Bug NMS-6081
Changed some keySet() iterations into more efficient valueSet() iterations.