log4j is provided
Merge branch 'master' into feature/fbeventrest