[openstack] Nonstandard ports in generated temp_urls.

Respect a nonstandard Swift port when generating a temp_url, as reported in #2723. I don't have a good way of testing OpenStack changes, however, or even running the tests :unamused: 

(I trimmed some trailing whitespace while I was at it :lipstick: )