Merge "Bump k8s to 1.11"