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