Updated Upstream (CraftBukkit) (#5786)

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:
fae895ac Fix inconsistent commands

Spigot-Server-Patches/Timings-v2.patch

@@ -774,19 +774,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  } else {
                      PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet);
                  }
-diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java
-@@ -0,0 +0,0 @@ public class PacketPlayInChat implements Packet<PacketListenerPlayIn> {
- 
-     @Override
-     public void a(PacketDataSerializer packetdataserializer) throws IOException {
--        this.a = packetdataserializer.e(256);
-+        this.a = org.apache.commons.lang3.StringUtils.normalizeSpace(packetdataserializer.e(256));
-     }
- 
-     @Override
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java