file system redirection: made changes to support rdesktop
file system redirection: resolved merge conflicts
Merge git://github.com/FreeRDP/xrdp