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