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