3.8: refresh all patches to remove conflicts

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>