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