GUACAMOLE-1031: Merge correction to handling of RDP SFTP upload directory.
GUACAMOLE-1031: Merge correction to handling of RDP SFTP upload directory.


glyptodon/guacamole-server,apache/guacamole-server,apache/guacamole-server,mike-jumper/incubator-guacamole-server,glyptodon/guacamole-server,glyptodon/guacamole-server,mike-jumper/incubator-guacamole-server,apache/guacamole-server,mike-jumper/incubator-guacamole-server,mike-jumper/incubator-guacamole-server