merge dev_4_4 -D org -I include -E exclude: PR 552 (Change var/logs/FSServer.log to var/log/FileServer.log (rebased onto dev_4_4))