Merge "Fix yamllint for ocpplugin"