fix typo
Merge branch 'master' into smarter-router

Conflicts:
	services/src/main/java/io/druid/cli/RouterJettyServerInitializer.java