Merge "Fix yamllint for releng-templates"