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

patches/server/Remove-Metadata-on-reload.patch

@@ -24,6 +24,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            playerMetadata.removeAll(plugin);
 +        }
 +        // Paper end
-         this.resetRecipes();
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
+         com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 622cf6111905e787add191b9a88d62656439ef31
+Subproject commit f992ce6097f846ed5967fc797d98ae3e84ef1b10

work/Spigot

@@ -1 +1 @@
-Subproject commit 66f9d3c17bd578dacbb87702cc0347148696e105
+Subproject commit 9472b09d5fa46afc41871d063689b5ddd89764b3