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