Upgrade netty in query server; fix tests