Merge "Changes to SL k8s addons"