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