OpenNMS Development: features-drift-remove-todos-mvr (22.0.0-SNAPSHOT)