OpenNMS Development: mbrooks-NMS-12140-part2 (25.0.0-SNAPSHOT)