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