Allow login-server to be disabled via spiff templates
Merge remote-tracking branch 'origin/pr/534' into develop
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  James Myers and Zach Robinson:
     Add comment explaining use of https for gems from git ( Travis created: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/39643886 )
     Revert "Change Gemfile to use github: for the github hosted gems" ( Travis Unknown )