OpenNMS Development: pr-NMS-10370 (21.1.0-SNAPSHOT)