merge master to 1.10, with fixes (#7682)

docs/tutorials/stateful-application/basic-stateful-set.md

@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - enisoc
 - erictune
 - foxish
@@ -465,7 +465,7 @@ In one terminal window, patch the `web` StatefulSet to change the container
 image again.
 
 ```shell
-kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"k8s.gcr.io/nginx-slim:0.8"}]'
+kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"gcr.io/google_containers/nginx-slim:0.8"}]'
 statefulset "web" patched
 ```