the login client gets a new scope, oauth.approvals to manage approvals for user applications
using upstream
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
saml_login is missing pre_packaging file, login and pivotal_login compile correctly, while saml_login does not.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:fhanik/cf-release
Merge remote-tracking branch 'upstream/master'
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Onsi Fakhouri:
     Generate environment variables in CC for diego staging message ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/19285299 )

Signed-off-by: Maria Shaldibina <mariash@pivotallabs.com>
add blobs for release v159
Merge tag 'v159'
Update contribution guidelines to indicate target branch for PRs

Signed-off-by: Aram Price <aprice@pivotallabs.com>
Bump src/loggregator

Bump :
  John Tuley:
     [#65121514] Remove unnecessary test file
  Alex Jackson:
     bump loggregator lib to pick up new emitter code
     use etcd as a distributed cache for syslog drain information
     dont set TTL for app in etcd... rely on dump sink timeout for removal
     use copy of localhost certs as encoded []byte constants rather than generating files
     refactor sink_manager to use blacklist
     move tests to httptest #test-stability
     mark flaky test as pending
     use new test logger from loggregatorlib to not use real files when testing logging
     move message router to new pattern for input chans
     better manage sinks by auto matically unregistering them with Run() returns
     import new sinkmanager package
     remove empty function
     remove unused interface
     move sinkamanger to its own package
     more deterministic tests for syslog sink #test-stability
     remove usused test file
     move websocket server to its own package
     use more un-relialable hostname in DNS failure test #test-stability
     bail on tests early when failed
     refactored sinks
     test tests with ginkgo
     fix CI
     wip
  Matthew McNew:
     Update SyslogWriter Test to use HTTPtest
     Add Ginkgo to travis path
     updated ginkgo setup
     Kick Travis Build
     fixup merge conflict badness
     Merge branch 'wip_loggregator_stages'
     green tests with refactor
     Major refactoring, stability fixes
  Jared Carroll:
     Add assertion to flaky spec
  Dakota Bailey:
     Increase KeepAlive timeout to fix tests on slow Travis box
Bump src/collector

Bump cloudfoundry/collector:
  John Tuley:
     [#66065824] Listen for both "bad_requests" and "rejected_requests" from router ( Travis Success: https://travis-ci.org/cloudfoundry/collector/builds/19192300 )
Up timeout for requests to service broker to 70s

[Finishes #63937406]
Fix configuration bug with syslog_aggregator
Allow manifest stub to override nats templates (used to disable nats_stream_forwarder)
Create uaa client for cc service client creator and pass to cc config
[#58040510]

Conflicts:
	jobs/cloud_controller_ng/spec
	jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb