Merge "Fix Yamllint Violations for jjb/joid"