Update a patch so it applies cleanly and remove another one, since it has already been applied upstream Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>