OpenNMS Development: jira-NMS-10258 (21.1.0-SNAPSHOT)