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