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