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