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