Upgraded Karaf to 2.3.2 which supports Spring 3.2.3.
Fix for NMS-6063 (Distributed map offered when no monitoring locations defined)
Merge branch 'space/13.2' into mvr/juniper-event-alarm-filters
Merge remote-tracking branch 'origin/master' into features/sonar-cleanup
Upgraded Spring to 3.2.3. Updated some transient dependencies so that
our dep management isn't restricting things to old versions (JEXL,
JUnit, Guava).
Fixed deprecation warnings for new JUnit 4.11 by migrating to
org.junit.Assert.
[bamboo] Automated branch merge (from 1.10:20ecfe3bc7e72ef43526ebb054133ff933ece35f)
fix for OPENNMS-NMS14-UNIT-3, change to distributed status text
Merge remote-tracking branch 'origin/space/13.2' into mvr/juniper-event-alarm-filters
Avoid unnecessary noise on PhysInterfaceTableTracker when the ifPhysAddress is null
[bamboo] Automated branch merge (from 1.12:bee4b78ee3bffd3480ae9ed3d94aa7d8446a6f91)
Revert "fix for OPENNMS-NMS14-UNIT-3, change to distributed status text", this
UI change was not made inside the Space branch. Please do not merge back to
master.

This reverts commit d8d8b7baf4fafb0fdde1d275f17c05f80fa1642b.
Revert "fix unit tests to find new distributed status string", this
UI change was not made inside the Space branch. Please do not merge back to
master.

This reverts commit 4a59a9207283e514812412be7aecaa9a01990d8b.
[bamboo] Automated branch merge (from space/13.2:4c48f48fb6b2ba2230560e8795c5b518d6c61a42)
Expose a counter via JMX that reflects the number of services polled.
Collect and graph the number of services polled via JMX.
Avoid possible NPE.
Expose a counter via JMX that reflects the number of automations executed.
Collect and graph the number of automations ran via JMX.
Merge branch 'master' into feature-jmx-stats