Updated Upstream (CraftBukkit/Spigot) (#4972)

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:
560b65c4 #707, SPIGOT-5063, SPIGOT-5304, SPIGOT-5656, SPIGOT-3206, SPIGOT-5350, SPIGOT-5980, SPIGOT-4672: Persist the exact internal text representation where possible.

Spigot Changes:
ff439d1e Rebuild patches

Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch

@@ -213,16 +213,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import java.util.EnumSet;
  import java.util.HashMap;
  import java.util.Iterator;
-@@ -0,0 +0,0 @@ import java.util.Locale;
- import java.util.Map;
+@@ -0,0 +0,0 @@ import java.util.Map;
  import java.util.NoSuchElementException;
+ import java.util.Objects;
  import java.util.Set;
 +import java.util.TreeMap; // Paper
  import java.util.logging.Level;
  import java.util.logging.Logger;
  import javax.annotation.Nonnull;
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-     private List<IChatBaseComponent> lore;
+     private List<String> lore; // null and empty are two different states internally
      private Integer customModelData;
      private NBTTagCompound blockData;
 -    private Map<Enchantment, Integer> enchantments;