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