CDK-210: Fixing URI user/password order.