Revert "Revert "Merge branch 'master' of github.com:cloudfoundry/cf-smoke-tests""
Revert "Revert "Merge branch 'master' of github.com:cloudfoundry/cf-smoke-tests""

This reverts commit 6db7b0547dcfc0e6cb1f68b173bbc8a96dcf0147.

Signed-off-by: Andrew Chang <8623e6fbc297352b6499224fce9f0e2e17f58e28@pivotal.io>

cloudfoundry/cf-smoke-tests,cloudfoundry/cf-smoke-tests,cloudfoundry/cf-smoke-tests,cloudfoundry/cf-smoke-tests