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