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