Add log4j dependencies.
Add log4j properties.
Merge branch 'develop'