OpenNMS Development: NMS-7986 (17.0.0-SNAPSHOT)