Merge pull request #552 from manics/rebased/dev_4_4/log_file_name-11676

Change var/logs/FSServer.log to var/log/FileServer.log (rebased onto dev_4_4)