Merge "Fix Yamllint violations for jjb/releng"