merge master to 1.10, with fixes (#7682)

docs/user-guide/nginx/OWNERS

@@ -1,3 +1,3 @@
-approvers:
+reviewers:
 - janetkuo
 

docs/user-guide/nginx/nginx-deployment.yaml

@@ -1,16 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: my-nginx
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.7.9
-        ports:
-        - containerPort: 80

docs/user-guide/nginx/nginx-svc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: my-nginx-svc
-  labels:
-    app: nginx
-spec:
-  type: LoadBalancer
-  ports:
-  - port: 80
-  selector:
-    app: nginx