Merge branch 'master' into fix-235

cfg/ocp-3.10/config.yaml

@@ -4,8 +4,19 @@
 master:
   apiserver:
     bins:
+      - openshift start master api
       - hypershift openshift-kube-apiserver
      
+  scheduler:
+    bins:
+      - "openshift start master controllers"
+    confs:
+      - /etc/origin/master/scheduler.json
+
+  controllermanager:
+    bins:
+      - "openshift start master controllers"
+
   etcd:
     bins:
       - openshift start etcd