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
CraftBukkit Changes:
ec86574b README.md updates
903c0e30 SPIGOT-4296: Ensure recipe group set in craft translation
89492315 launchProjectile Fish -> FishHook
9ba77eed6b