Avoid locking every time we return a connection
Fix putting into an immutablemap
Merge branch 'master' of https://github.com/datastax/java-driver