update guava, java-util, and druid-api
Merge branch 'master' of github.com:metamx/druid into new-guava
Merge branch 'master' into new-guava

Conflicts:
	server/src/main/java/io/druid/server/QueryResource.java
address code review
Merge branch 'master' of github.com:metamx/druid into new-guava
fix bad merge
Merge branch 'master' into new-guava
Downgrade guice to 4.0-beta.
[maven-release-plugin] prepare release druid-0.6.124
[maven-release-plugin] prepare for next development iteration
Make TimeBoundaryQuery buildResult no longer static.
[maven-release-plugin] prepare release druid-0.6.125
[maven-release-plugin] prepare for next development iteration
Indexing: Make default hadoop coordinates configurable.
fix timeout test race condition
update maven-release-plugin to 2.5
Merge pull request #607 from metamx/update-maven-release

update maven-release-plugin to 2.5
Merge pull request #605 from metamx/default-hadoop-coordinates-config

Indexing: Make default hadoop coordinates configurable.
fix initialization test static state dependency
Merge pull request #608 from metamx/fix-initialization-test

fix initialization test static state dependency