OpenNMS Development: revert-2002-jira-NMS-10159 (24.0.0-SNAPSHOT)