Changed Xmx value and configuration path for log4j
Merge branch 'master' of github.com:olark/druid