OpenNMS Development: cg-jira-NMS-10309 (23.0.0-SNAPSHOT)