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