Fixing URI trimming for SQL (3008236)
Merge pull request #845 from hovsepm/sqltrim

Fixing URI trimming for SQL (3008236)