remove obsolete properties from cloud_controller

Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com>
Merge branch 'master' of github.com:cloudfoundry/cf-release

Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com>

Conflicts:
	jobs/cloud_controller_ng/spec