OpenNMS Development: pr-jira-NMS-7582 (18.0.0-SNAPSHOT)