OpenNMS Development: revert-2905-jira-NMS-12557 (26.0.0-SNAPSHOT)