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