merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 379 (Fix source code links moved to the scifio-tools foder)