allow log4cxx dependency to be disabled
Merge branch 'master' into reposit