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