OpenNMS Development: jira-NMS-8924 (17.0.1-SNAPSHOT)