Added a comparator to the getPrimaryInterface() method of OnmsNode so
that the most recently scanned interface is always returned.
Fix of #SPC-480
Added reversible sorting to the primaryInterface sorting in NodeTable.
Added some calls to internal com.vaadin.ui.Table functions so that the
sort column indicators are refreshed when sorting on the
primaryInterface column. Unfortunately, this doesn't style the
primaryInterface column but it does reset the styles on the other
columns.
update how we calculate the link status for edges in linkd topo provider
Updated NodeDaoContainer so that it doesn't set the primaryInterface
column as non-sortable so that it still applies the sorting CSS styles
when our HeaderClickListener changes the sorting. Fixes bug SPC-579.
Reversed the sorting of nulls and the asc/desc indicator to make
primaryInterface match the other string fields in a Container.
allow overriding opennms.conf with a user-specific file
Merge branch '1.12'
NMS-5889 fix system-report running
Merge branch '1.12'
Revert "Work around JAXB/JDK7 issue http://bamboo.internal.opennms.com:8085/browse/OPENNMS-MASTER17-TEST-89"

This reverts commit a72a63caecf77a30f742fa2fd0567184dd945ddb.
Merge branch '1.12'
Reinstate JAXB deps to work around JDK bugs.

Revert "NMS-5482 remove unnecessary JAXB dependencies"

This reverts commit 7c8fe95d64ec14fda1b771841e049c12f04753c4.

Conflicts:
	integrations/opennms-link-provisioning-adapter/pom.xml
	opennms-base-assembly/pom.xml
reinstate JAXB dependencies, using servicemix version instead
remove springsource jaxb references
Reinstate JAXB deps to work around JDK bugs.

Revert "NMS-5482 remove unnecessary JAXB dependencies"

This reverts commit 7c8fe95d64ec14fda1b771841e049c12f04753c4.

Conflicts:
	integrations/opennms-link-provisioning-adapter/pom.xml
	opennms-base-assembly/pom.xml
reinstate JAXB dependencies, using servicemix version instead
updates/fixes to deal with merge of JAXB changes from 1.12
Merge branch '1.12'

Conflicts:
	dependencies/jaxb/pom.xml
	features/ncs/ncs-model/pom.xml
	features/opennms-jmx-tools/pom.xml
	opennms-base-assembly/src/assembly/daemon.xml