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:
411609dc SPIGOT-5053: Initialize beacon with stored levels where available
b1c5fd68 SPIGOT-5054: Prevent issue with invalid hanging entities
1cf86b8970