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