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