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