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