Merge "doc fix k8s/docker versions"