CDK-210: Fixing user/pass order in URI builders.

This was overlooked when fixing CDK-210. When building FS URIs, this
should use the correct user-then-password order.