Fix NMS-5894: add a call to getNodeType() before comparing names
no idea why these particular things want old jaxb/stax/etc. but I cannot seem to make them work with modern jaxb
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/SmbMonitor.java
Merge branch 'master' into pull-requests