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:
297ff400 SPIGOT-5467: Don't play sound or increase honey level if bee leaving hive is cancelled
7d677e7b SPIGOT-5476: Fix trading empty items
9205b75c86