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