Merge "Fix yamllint for odlparent"