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