Updated Upstream (CraftBukkit/Spigot)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
f992ce60 Fix duplicate datapack reload on /reload

Spigot Changes:
9472b09d Rebuild patches

patches/server/Paper-config-files.patch

@@ -708,8 +708,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
  
          this.pluginManager.clearPlugins();
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         this.resetRecipes();
+         this.commandMap.clearCommands();
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
 +        com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper