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