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