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