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