TODO removed
log4j support
Merge branch 'master' into statsdClient