Upstream has released updates that appear 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:
ab6e73a2 Correct copied javadoc from previous commit
CraftBukkit Changes:
9fb3aa4c SPIGOT-6817: Revert back to old block state behaviour again