Fix v1 services cases

Change-Id: Id3283015eaf96f16d4ed1a62c943c103f74da687
Reviewed-on: http://reviews.cloudfoundry.org/13569
Tested-by: CI Master <cf-ci@rbcon.com>
Reviewed-by: Maria Shaldybina <mariash@vmware.com>