Merge "Fix Yamllint Violations for jjb/ves"