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