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