Merge remote-tracking branch 'github/master' into
OracleSupportSingleCommit

Conflicts:
	lib/cloud_controller/models/quota_definition.rb