Upstream merge
Remove the null world/locations patches

These isn't help catch the plugin causing the issues and actually broke some plugins in the process
Upstream merge
Remove 'Normalize spaces on when reading a chat packet' as it was fixed upstream
Upstream merge: conflict resolution and version bump
Process conversation input on the main thread. BUKKIT-5611
Modify the async skull converter to work around a client bug
Fix a ConcurrentModificationException in the antixray
Correct formatting of the "Configurable UserCache cap" patch
Add an API to restart with a specific script.
Add alternative hopper ticking

This change offers a config option intending to improve hopper ticking performance while maintaining vanilla hopper behavior. Rather than polling each hopper each tick, this alternative method relies on inventory changes and redstone updates to schedule a hopper tick.
Oops: Fix compile
Add config option for when UserCache saves
Replace typing yes into the console with a 10 second wait - most have updated or are aware of the changes by now
Upstream merge
publicate plugins file
Merge remote-tracking branch 'upstream/master'