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