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