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