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