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