Fixed a bug in BuildDestinationUri; it was dropping some encoded uri seg...

Fixed a bug in BuildDestinationUri; it was dropping some encoded uri segments.

Upgraded the BuildDestinationUri unit tests.