Merge "Fix yamllint for sxp"