Remove patches applied upstream we no longer need to maintain here. Signed-off-by: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>