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