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