Add cleanup after service spec because we were exceeding max service count
Merge branch 'master' of github.com:cloudfoundry/cf