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
More flexible EC2 user data classes.
Fix busted TaskConfig.
[maven-release-plugin] prepare release druid-0.6.127
[maven-release-plugin] prepare for next development iteration
Docs for defaultHadoopCoordinates.
Indexing: Allow null userData.
Docs for string-based EC2 userData.
Merge pull request #610 from metamx/ec2-user-data

More flexible EC2 user data classes.
[maven-release-plugin] prepare release druid-0.6.128
[maven-release-plugin] prepare for next development iteration
Merge pull request #578 from metamx/new-guava

Update guava, java-util, and druid-api
remove snapshot dep
Fix example middle manager configs.