Merge 'feature-log4j_integration' into 'develop'

Finish log4j integration.