Cleanup + The first StatusProvider registered in the system is automatically selected/enabled.
Merge branch 'master' of github.com:OpenNMS/opennms
fix for SPC-649
a little cleanup of address stuff for linkd
a bit more cleanup of inetaddress usage
this test has probably been wrong all along, since it was added after we did the IPv6 stuff with bad null-checking in InetAddressUtils
Merge branch '1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/linkd/AbstractQueryManager.java
	opennms-services/src/main/java/org/opennms/netmgt/linkd/DbEventWriter.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/Nms101Test.java
add support for reading status code, SPC-651
Merge with master
jdk7 patch: 1. update jdbc classes to define new JDBC 4.1 method getParentLogger() method 2. Fix jdk7 compile error in OnmsCriteria (... have the same erasure, yet neither overrides the other) 3. Add jdk7+ maven profile when running under jdk7+ that adds tools.jar when maven-jaxb-schemagen-plugin is used.

Tested building OpenNMS using Oracle JDKs 1.6.0_35 and 1.7.0_07, and OpenJDK 1.7.0_06.
Tested running OpenNMS after building with OpenJDK 1.7.0_06 with Oracle JDK 1.6.0_35.

$ /usr/lib/jvm/java-1.7.0-openjdk.x86_64/bin/java -version
java version "1.7.0_06-icedtea"
OpenJDK Runtime Environment (fedora-2.3.1.fc17.2-x86_64)
OpenJDK 64-Bit Server VM (build 23.2-b09, mixed mode)

$ /usr/java/jdk1.7.0_07/bin/java -version
java version "1.7.0_07"
Java(TM) SE Runtime Environment (build 1.7.0_07-b10)
Java HotSpot(TM) 64-Bit Server VM (build 23.3-b01, mixed mode)

$ /usr/java/jdk1.6.0_35/bin/java -version
java version "1.6.0_35"
Java(TM) SE Runtime Environment (build 1.6.0_35-b10)
Java HotSpot(TM) 64-Bit Server VM (build 20.10-b01, mixed mode)

Conflicts:
	opennms-dao/src/main/java/org/opennms/netmgt/config/C3P0ConnectionFactory.java
	opennms-dao/src/main/java/org/opennms/netmgt/config/DBPoolConnectionFactory.java
	opennms-dao/src/main/java/org/opennms/netmgt/config/DataSourceFactory.java
	opennms-dao/src/main/java/org/opennms/netmgt/config/TomcatJdbcPoolConnectionFactory.java
	opennms-dao/src/test/java/org/opennms/netmgt/dao/db/TemporaryDatabase.java
	opennms-model/src/main/java/org/opennms/netmgt/model/OnmsCriteria.java
fix java 7 building

Conflicts:
	container/servlet/pom.xml
	features/sms-reflector/poms/pom.xml
	opennms-assemblies/jmx-config-generator-onejar/pom.xml
	opennms-assemblies/remote-poller-onejar/pom.xml
	pom.xml
Merge remote-tracking branch 'origin/pull-requests'
Merge with branch hibernate3.6.10.Final. Added Paging/Caching to OnmsDaoContainer. Switched to Hibernate3.6.10.Final
Fix for Enhancement NMS-5933
NMS-5930 fix for alarm error UI
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	core/db/src/main/java/org/opennms/core/db/C3P0ConnectionFactory.java
	core/db/src/main/java/org/opennms/core/db/DataSourceFactory.java
	core/test-api/db/src/main/java/org/opennms/core/test/db/TemporaryDatabase.java
	opennms-config/src/main/java/org/opennms/netmgt/config/DBPoolConnectionFactory.java
	opennms-config/src/main/java/org/opennms/netmgt/config/TomcatJdbcPoolConnectionFactory.java
	opennms-model/src/main/java/org/opennms/netmgt/model/OnmsCriteria.java
	pom.xml
Merge branch '1.12'

Conflicts:
	opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp
Clean-up MIB Tree Container and Removing Filename Restriction.

There is no need to define and keep a reference to a
HierarchicalContainer. The Tree object should handle
everything.

Also the comment at the top that says:
"The file name requires to be the same as the MIB to
be processed."
Is not necessary anymore, because the MIB Parser will
rename the file to be the name of the MIB automatically.
put this back
Merge branch '1.12'