Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@75280ef Fix cancelling EntityDeathEvent for Armor Stands killed by players (#6478)
PaperMC/Paper@6f57163 Add CompostItemEvent and EntityCompostItemEvent (#6356)
PaperMC/Paper@5cc78f2 Use configured log prefix for spigot library loading (#7934)