create map of outages in Outages for performance
cleaning up Ouages, and adding a performance test

With the changes, the test for outage verification takes 2 ms. The
same test executed without the changes takes 36 ms.
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	opennms-config/src/main/java/org/opennms/netmgt/config/poller/Outages.java
	opennms-services/src/main/java/org/opennms/netmgt/config/PollOutagesConfigManager.java
	opennms-services/src/test/java/org/opennms/netmgt/config/PollOutagesConfigManagerTest.java
Missing curly-brace in filtered token of provisiond-configuration.xsd
Changed AbstractSnmpValue so that ISO-8859-1 strings are accepted as "displayable".
Fixes bug NMS-5281. Also changed the handling of 63-bit hexstring counters in the
FCMGMT-MIB so that we don't accidentally try to handle 8-digit decimal values as
weird FCMGMT counters. Fixes bug NMS-6202.

Conflicts:
	core/snmp/api/src/main/java/org/opennms/netmgt/snmp/AbstractSnmpValue.java
	core/snmp/api/src/main/java/org/opennms/netmgt/snmp/SnmpUtils.java
	opennms-services/src/main/java/org/opennms/netmgt/collectd/SnmpAttribute.java
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	core/snmp/api/src/main/java/org/opennms/netmgt/snmp/SnmpUtils.java
	opennms-config-model/src/main/java/org/opennms/netmgt/config/poller/Outages.java
	opennms-config/src/main/java/org/opennms/netmgt/config/PollOutagesConfigManager.java
	opennms-config/src/test/java/org/opennms/netmgt/config/PollOutagesConfigManagerTest.java
	opennms-services/src/main/java/org/opennms/netmgt/collectd/SnmpAttribute.java
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