Merge "Fix yamllint for didm"