Adding ability in spiff template to override properties.scim.userids_enabled

See related thread at https://groups.google.com/a/cloudfoundry.org/d/msg/vcap-dev/xC8zK5i3s-4/94_69HXaZrwJ
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Chris Adams:
     Merge pull request #188 from fraenkel/addbuildpacks ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/22044518 )
  Ruth Byers:
     On drain, unregister from the router and wait before shutting down ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/21981348 )
  fraenkel:
     Use the new buildpack installer task ( Travis Unknown )

Signed-off-by: Kai Zhang <kaizhang@cn.ibm.com>
Move CC drain script from nginx_drain.rb to drain.rb

* It's a drain for all of CC, not just nginx.

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

Bump cloudfoundry/cloud_controller_ng:
  Abhijit Hiremagalur:
     Reduce knowledge about the db in positioner ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/22055319 )
     Encapsulate shift_to_position in update ( Travis Unknown )
     Extract BuildpackPositioner ( Travis Unknown )
     Need to call destroy to exercise after_destroy ( Travis Unknown )
     Remove dead code related to prioritized buildpacks ( Travis Unknown )
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Abhijit Hiremagalur:
     Split responsibilities of calculating position and shifting ( Travis created: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/22063632 )
     Positioner no longer know about Buildpack.db ( Travis Unknown )
     Be defensive about hash key style ( Travis Unknown )
Bump src/dea_next

Bump cloudfoundry/dea_ng:
  Matthew Sykes:
     Extract admin_buildpack_paths method ( Travis started: https://travis-ci.org/cloudfoundry/dea_ng/builds/22064642 )
     Buildpack url in staging response unnecessary ( Travis Unknown )
     Test cleanup and backfill for PR 114 ( Travis Unknown )
     Add info about buildpack used to staging response. ( Travis Unknown )
  Eric Malm:
     Replace Timeout.timeout with event machine timer timeout ( Travis Success: https://travis-ci.org/cloudfoundry/dea_ng/builds/22053277 )
     Rename spec helper #em => #with_event_machine ( Travis Success: https://travis-ci.org/cloudfoundry/dea_ng/builds/21988816 )
     Stop doing calculations in #synchronize'd call ( Travis Unknown )
     Stop setting up unused console port on container ( Travis Unknown )
     Inline variables, normalize Warden calls ( Travis Unknown )
     Make #with_em private ( Travis Unknown )
     Remove unused code ( Travis Unknown )
     Reorder for clarity ( Travis Success: https://travis-ci.org/cloudfoundry/dea_ng/builds/21980922 )
     Initialize warden requests with parameters ( Travis Unknown )
     Parenthesize all logging calls ( Travis Success: https://travis-ci.org/cloudfoundry/dea_ng/builds/21974590 )
     Update #promise_stop to accept a kill flag ( Travis Success: https://travis-ci.org/cloudfoundry/dea_ng/builds/21959016 )
  Aram Price:
     Remove staging timeout grace period ( Travis Success: https://travis-ci.org/cloudfoundry/dea_ng/builds/21976587 )
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Aram Price:
     Hoist timeout values to the top, trim comments ( Travis created: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/22065172 )
  Ruth Byers:
     Add more logging and DRY up router deregister ( Travis Unknown )
     Clean up in drain script ( Travis Unknown )
  Abhijit Hiremagalur:
     Split responsibilities of calculating position and shifting ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/22063632 )
     Positioner no longer know about Buildpack.db ( Travis Unknown )
     Be defensive about hash key style ( Travis Unknown )
     Reduce knowledge about the db in positioner ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/22055319 )
     Encapsulate shift_to_position in update ( Travis Unknown )
     Extract BuildpackPositioner ( Travis Unknown )
     Need to call destroy to exercise after_destroy ( Travis Unknown )
     Remove dead code related to prioritized buildpacks ( Travis Unknown )
Restore max_package_size configuration for CC.
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Matthew Sykes:
     Merge branch 'pr/196' ( Travis created: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/22066945 )
     Restore max_package_size in the config template ( Travis Unknown )
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Abhijit Hiremagalur:
     Remove unused exceptions, extract the rest to their files ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/22068483 )
Merge remote-tracking branch 'origin/pr/338' into develop

Conflicts:
	packages/ruby
	src/gorouter
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Chris Adams:
     Disallow setting an app to zero instances ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/22135215 )

[delivers #61926402]

Signed-off-by: Eric Malm <emalm@pivotallabs.com>