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