Merge "Fix k8s master/pool enabled parameters"