Fixed a bug with the ConnectionHandler threads' hashmap and an issue with the WriteQueue.
Merge origin/master