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