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