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