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