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