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:
a721c4ff Revert "SPIGOT-5515: Add basic validation against creating non-item itemstacks"
98369302 SPIGOT-5516: Correct EnchantmentTarget values
a11aad21 SPIGOT-5515: Add basic validation against creating non-item itemstacks
CraftBukkit Changes:
752cf95e SPIGOT-5510: VehicleBlockCollisionEvent returns the wrong block
ec4b2b5e SPIGOT-5516: Correct EnchantmentTarget values
5c2dbe90d1