OpenNMS Development: NMS-8039 (17.0.1-SNAPSHOT)