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