Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Bukkit Changes:
9a793cce Remove no longer applicable caveats to setPlayerListName
7137829e SPIGOT-4496: Undeprecate MapView.getId and make int
de33ade0 Remove some draft API designations
a35fa838 SPIGOT-4472: Add Consumer scheduler methods

CraftBukkit Changes:
8cd538e6 SPIGOT-4498: Crash on startup
b4ee04ba SPIGOT-4496: Undeprecate MapView.getId and make int
ec937d0e SPIGOT-4472: Add Consumer scheduler methods

Spigot Changes:
a1f2566f Use monotonic time for watchdog
bc4adcbf SPIGOT-4498: Crash on startup
bb387e6c Rebuild patches

Spigot-Server-Patches/Hook-into-CB-plugin-rewrites.patch

@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 24d608399f..212a50c88e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -0,0 +0,0 @@ import java.io.FileOutputStream;
@@ -172,9 +172,9 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                          {
                              super.visitFieldInsn( opcode, owner, name, desc );
 @@ -0,0 +0,0 @@ public class Commodore
-                     @Override
-                     public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf)
-                     {
+                             return;
+                         }
+ 
 +                        // Paper start - Rewrite plugins
 +                        owner = getOriginalOrRewrite( owner) ;
 +                        if (desc != null)