(cherry picked from commit 043cc922b95b0620b7ddb76b7bb19d96498d2561) Signed-off-by: John Blum <jblum@pivotal.io>