Updated Upstream (Bukkit/CraftBukkit) (#8430)

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

Bukkit Changes:
09943450 Update SnakeYAML version
5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc
6f82b381 PR-788: Add getHand() to all relevant events

CraftBukkit Changes:
aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe
5329dd6fd PR-1107: Add getHand() to all relevant events
93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY

patches/api/0213-Brand-support.patch

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: DigitalRegent <misterwener@gmail.com>
+Date: Mon, 6 Apr 2020 20:30:09 +0200
+Subject: [PATCH] Brand support
+
+
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index 5a84c4c5644f5d82896c693939ddc7d30a69cc97..8f7667562187a141ec037eaafa2e3e8d1abd6bff 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -2644,6 +2644,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+         // Paper end
+     }
+ 
++    // Paper start - brand support
++    /**
++     * Returns player's client brand name. If the client didn't send this information, the brand name will be null.<br>
++     * For the Notchian client this name defaults to <code>vanilla</code>. Some modified clients report other names such as <code>forge</code>.<br>
++     * @return client brand name
++     */
++    @Nullable
++    String getClientBrandName();
++    // Paper end
++
+     @NotNull
+     @Override
+     Spigot spigot();