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