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