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