Updated topology icons for linux and opennms servers.
Merge branch 'master' of github.com:OpenNMS/opennms
NMS-6425, target of at least one should still show geo maps operation
Merge branch 'master' of github.com:OpenNMS/opennms
Only show View in Geo Maps operation when node has geo location
Bumped log4j2 to version 2.0-rc1
Added Spring DM metadata to soa and opennms-config packages so that we can
launch them inside Karaf. Moved Capsd bean out of applicationContext-commonConfigs.xml.
Moved OnmsOSGiBridgeActivator into the core/soa project. Moved the
applicationContext-commonConfigs.xml context into the opennms-config
project so that it can be used to expose configuration beans as OSGi
services. Added Spring DM metadata to the core/soa and opennms-config
projects.
Moved widely-used utility classes from opennms-util into core/lib. Moved
Notifd Argument class into Notifd's model to reduce deps on opennms-util.
Add a bunch of debug logging to VmwareRequisitionUrlConnection
Refactored DNS bits of InetAddressUtils into separate DnsUtils class
so that we don't need a dnsjava dependency in a core class.
Moved a couple more classes from opennms-util into core/lib so that
opennms-config no longer relies on opennms-util.
Added Export-Package directives to opennms-util.
Fixed InetAddressComparator location. Fixed missing dep in opennms-model
project. Added applicationContext-*-osgi.xml files for core/soa and
opennms-config projects so that the ServiceRegistry is registered as an
OSGi service so that projects can register services across OSGi modules.
Added org.opennms.netmgt.config.api to system classpath.
Cleaned up commented-out references to the CollectdConfigFactory in contexts.
Remove Logger creation from synchronized block.  Add log messages before and after sync block to determine lock wait times
Remove Logger creation from synchronized block.  Add log messages before and after sync block to determine lock wait times

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/poller/DefaultPollContext.java
Remove Logger creation from synchronized block.  Add log messages before and after sync block to determine lock wait times

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/poller/DefaultPollContext.java

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/poller/DefaultPollContext.java
fix a possible synchronization issue in pendingPollEvent and adjust logging levels