OpenNMS Development: pr-jira-NMS-10372 (21.1.0-SNAPSHOT)