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