Update sysctl from upstream and replay our changes