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