Bring vcap-services up-2-date with cf/vcap-services