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