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