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