Merge branch 'v3-master' into entity-pipeline

* v3-master:
  Fix e2e test
  Fix cf init script given changes in broker service (#3746)
  Update protractor to fix travis e2e tests (#3747)
  Same Tweaks at space level - Show edit quota on space level quota details page - Ensure we return from edit stepper from org's space quota list, org level quota page and space level quota page - Apply permissions to edit quota
  Tweaks - Show edit quota on org level quota details page - Ensure we return from edit stepper from cf quota list, cf level quota page and org level quota page - Apply permissions to edit quota - Change org --> space in space level quota page - Fix validation for sub 0 values
  Small tweaks
  created unlimited-input comp / refactored quota forms
  org/space quotas: listing and management

Author: Nathan Jones

deploy/tools/populate-cf/create-services.sh

@@ -13,6 +13,8 @@ CF_API_ENDPOINT=https://api.local.pcfdev.io
 # Skip login - run against whatever target the cf CLI is configured for
 SKIP_LOGIN=false
 
+BROKER_CRED=broker
+
 while getopts ":o:s:u:p:a:n" opt ; do
     case $opt in
         o)
@@ -46,6 +48,8 @@ function pushBrokerApp {
   cf set-env $APPNAME SERVICE_NAME $SERVICE
   cf set-env $APPNAME SERVICE_PLAN_NAME shared
   cf set-env $APPNAME TAGS simple,shared
+  cf set-env $APPNAME AUTH_USER $BROKER_CRED
+  cf set-env $APPNAME AUTH_PASSWORD $BROKER_CRED
   cf env $APPNAME
   cf start $APPNAME
   popd
@@ -62,7 +66,7 @@ function createService {
     cf target -o $ORG -s $SPACE
     SPACE_ARGS="--space-scoped"
   fi
-  cf create-service-broker $SERVICE $USER_NAME $USER_PASS https://$SERVICE_URL $SPACE_ARGS
+  cf create-service-broker $SERVICE $BROKER_CRED $BROKER_CRED https://$SERVICE_URL $SPACE_ARGS
 }
 
 function makeServicePublic {