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