Committing after couple of fixes:
- Merged latest changes from Citrix
- Fixed ShareFile path trim issue