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