Merge "Fix Yamllint Violations for jjb/pharos"