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