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