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