generalize app name regexp to allow for new and old capi versions
generalize app name regexp to allow for new and old capi versions

Signed-off-by: Michael Xu <83442d059368ed668d9c9b08b4782479ea3f8a4e@pivotal.io>

matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests