Merge "Fix Yamllint Violations for jjb/escalator"