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