Fixed compile error from merge.
Upgraded Log4j2 from 2.0-rc2 to 2.0
Fix for Bug NMS-6757

High CPU usage due to DataCollectionConfigDao.getConfiguredResourceTypes() while Collectd starts.
Updated standalone properties files to match the Karaf version of 2.3.4.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config/src/main/java/org/opennms/netmgt/config/DefaultDataCollectionConfigDao.java
Updated configs to deviate less from Karaf 2.3.4.
Added some comments to org.apache.karaf.features.cfg.
Fix for Bug NMS-6757 - Part II

It turns out that the current implementation of the
DefaultDataCollectionConfigDao class was not adding the resource types
defined inside the snmp-collection (like the old format of the files),
it was checking only the resource types defined on the
datacolelction-group files.
Merge remote-tracking branch 'origin/1.12'
NMS-6757 - Part II - Fixing compiling issues
Squashed commit of the following:

commit 61b93196340e0d65ba79e54375fa0e0ce2985daf
Merge: 8a0242d c5a2f01
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Sat Jul 26 09:06:53 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into feature/iplike-search-placeholder

commit 8a0242d9a9381bff9077eeace009843687eb502d
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Mon Jul 21 13:55:47 2014 -0400

    Change IPLIKE search boxes to have empty value and "*.*.*.*" in placeholder
[bamboo] Automated branch merge (from 1.12:caa3decb7f6ea3e62b9ecb44ebe6bf77019a794b)
Cleaned up Karaf build a little.
Merge branch 'master' of https://github.com/OpenNMS/opennms
Fix for Bug NMS-6758

The upgrade tools partially fix the KSC Reports when fixing the
interface directories.
Added exclusions back to Karaf assembly.
[bamboo] Automated branch merge (from 1.12:266e2ab1d365b68f544d13fcf40335d97e43d219)
Fixing handling of org.opennms.provisiond.scheduleRescanForUpdatedNodes.

Be sure that the default is true even if that system property is not
set.
Fix for Bug NMS-6759

The rescanExisting flag in Provisiond is not working as expected.

Now the nodeUpdated event will contain a parameter with the value of
rescanExisting. This is going to be used by the event handler on
Provisioner, in order to skip the detectors depending on it.

The provisioning adapters are still going to be executed, but if it is
necessary to supress them, the procedure is to fix the handler in
ProvisioningAdapterManager.
Cleaned up feature and bundle names for topology and NRTG so that they
look prettier in the Karaf console.