Changes to include log4j in distribution.