convert hardcoded versions to ${project.version}
Implement 404 page not found handlers, that display an OpenNMS UI branded page, rather than the default jetty page.
Fix for issue NMS-5938, using primary interface address for querying VMware CIM metrics
Merge branch 'master' of github.com:OpenNMS/opennms
Merge remote-tracking branch 'origin/pull-requests'
Merge branch '1.12'

Conflicts:
	features/topology-map/themes/default-theme/pom.xml
	opennms-tools/csv-requisitions/pom.xml
	opennms-tools/ireport-jrobin-provider/pom.xml
	opennms-tools/jrobin-spike-hunter/pom.xml
	opennms-tools/mib2events/pom.xml
	opennms-webapp/pom.xml
Merge branch 'master' into pull-requests