fix for NMS-6214 (duh)
Fix for NMS-6288 - provision.pl is mentioning nothing about parent-foreign-source
Add some commonly-needed MIB definitions to the default compiled
set. The RFC-1212 provided in this commit is a shim (jsmiparser
defines the OBJECT-TYPE macro internally) and the RFC1213-MIB in
this commit is modified not to attempt to import OBJECT-TYPE.
This should save time and pain for first-time users of the MIB
compiler.
Add some commonly-needed MIB definitions to the default compiled
set. The RFC-1212 provided in this commit is a shim (jsmiparser
defines the OBJECT-TYPE macro internally) and the RFC1213-MIB in
this commit is modified not to attempt to import OBJECT-TYPE.
This should save time and pain for first-time users of the MIB
compiler.

This commit fixes NMS-6183.
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
Merge branch 'master' into pjsm/2.0
Fixed AlarmIdNotFoundException smoke test failure by fixing the try/catch
statement inside AlarmDetailController so that it throws the exception properly.
This is related to fixes for bug NMS-6125.
Merge branch 'master' into pjsm/2.0
Refactored AbstractSpringJerseyRestTestCase into a REST test library. Updated
the HSQLDB test database Spring contexts in core/test-api/db.
Fixed AbstractSpringJerseyRestTestCase imports.
Merge branch 'master' into soleger-master
Merge remote-tracking branch 'origin/1.12'
Migrated some Hibernate annotations to standard JPA annotations.
Got rid of deprecated calls to DataSourceFactory.init().
Fix for NMS-3611 - add parent relationships (path outages) in provisioning WebUI
Fix for NMS-6169 - Null ifSpeed issue (part II)

Improving the message displayed on the logs when a null ifSpeed is
detected.
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/PhysInterfaceTableTracker.java
Document default MAXIMUM_FILE_DESCRIPTORS in examples/opennms.conf
Undid AbstractSpringJerseyRestTestCase refactoring in NCS code because it's not
quite working correctly.