Merge "fix yamllint config file"