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