Merge "Fix Yamllint violations for jjb/snaps"