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