tuning java parameter to slim mem usage for MCF
Merge remote-tracking branch 'origin/pr/258' into develop

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

[#76992480]

Bump cloudfoundry/cloud_controller_ng:
  Abhijit Hiremagalur:
     Cleanup whitespace ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/32907588 )
     Merge remote-tracking branch origin/pr/280 ( Travis Unknown )
  Stewart Nickolas:
     CC should reject apps that specify both a custom buildpack and a docker image ( Travis Unknown )