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