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