Merge "Fix Yamllint violations for jjb/xci"