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