Merge "Bump Kubernetes version to 1.8.4-3"