Merge "Fix Yamllint violations for jjb/sfc"