Merge "Fix yamllint for packaging"