text: Title: oc cluster up --service-catalog=true fails to register template broker
  Body: For me, cluster up consistently times out trying to install the template broker when using the service catalog.
  
  ```
  $ oc cluster up --version=latest --service-catalog=true
  ```
  
  Service catalog is running without errors, but the template broker is not registered. Increasing the log level, I see
  
  ```
  -- Installing service catalog ...
  I0703 08:12:49.666835   32682 servicecatalog.go:85] instantiating service catalog template
  I0703 08:12:55.799747   32682 servicecatalog.go:95] polling for service catalog api server endpoint availability
  I0703 08:13:00.800325   32682 servicecatalog.go:95] polling for service catalog api server endpoint availability
  I0703 08:13:00.804488   32682 servicecatalog.go:110] setting up the api aggregator
  I0703 08:13:00.810042   32682 servicecatalog.go:142] registering the template broker with the service catalog
  I0703 08:13:01.815732   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:02.815544   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:03.816358   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:04.815602   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:05.813794   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:06.844970   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:07.835231   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:08.815566   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:09.820726   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:10.812604   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:11.816320   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:12.815285   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:13.815608   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:14.816297   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:15.812245   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:16.820990   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:17.815509   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:18.815179   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:19.815231   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:20.813902   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:21.814974   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:22.815265   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:23.815524   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:24.815143   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:25.813003   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:26.816452   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:27.815056   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:28.815034   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:29.815683   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:30.812381   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  I0703 08:13:30.814036   32682 servicecatalog.go:178] retrying registration after error the server could not find the requested resource (post brokers.servicecatalog.k8s.io)
  FAIL
     Error: failed to register broker with service catalog: timed out waiting for the condition
  ```
  
  ##### Version
  
  Current master.
  
  ```
  $ oc version
  oc v3.6.0-alpha.2+fc34104-740
  kubernetes v1.6.1+5115d708d7
  features: Basic-Auth
  
  Server https://127.0.0.1:8443
  kubernetes v1.6.1+5115d708d7
  ```
  
  cc @bparees @csrwng 