OpenNMS Development: revert-2383-jira-NMS-10603 (25.0.0-SNAPSHOT)