Increase default SSH timeout for OpenStack from 1m -> 5m

Many cloud providers have a minimum charge of 1 hour, and if there are DNS problems we can hit the 1 minute timeout easily.

Waiting five minutes gives more of a margin of error.
Fixing up after merge
Only pass the TenantName if a project is specified

e.g. Rackspace doesn't need it (I think)
Merge branch 'increase_ssh_timeout'