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