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