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