CLOUDIFY-2413 file_server small tweaks