OpenNMS Development: jira-NMS-10239-rebase (21.1.0-SNAPSHOT)