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