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:
72520b78 Add PlayerSpawned API for Endermites
CraftBukkit Changes:
7fa173e6 Remove unnecessary line in BlockMushroom
cc1e3497 Add PlayerSpawned API for Endermites
Spigot Changes:
078a7f52 Rebuild patches
35e52a42ab