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