OpenNMS Development: pr-jira-NMS-10644 (25.0.0-SNAPSHOT)