OpenNMS Development: mbrooks-HZN-1383-Fix (23.0.0-SNAPSHOT)