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