Revert to 1.5 despawning behaviour for Ocelots and Wolves. Fixes BUKKIT-4449