merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 368 (Remove hard dependency on log4j)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 373 (Sprint5 bug fixes)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 376 (Logging docfix)