fix for concurrent modifications in druid server
Merge branch 'master' of github.com:metamx/druid
Merge branch 'master' into druid-paper