Merge "Fix deploy template tests on Rocky and earlier"