fix for node label test failures
Merge remote-tracking branch 'origin/bamboo/OPENNMS-NMS-UNIT-298'