Merge "No cinderlib testing in 2024.1 and later jobs"