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