OpenNMS Development: jira-NMS-10474-f18 (21.1.0-SNAPSHOT)