Catch timeouts when import public keys in IaaS

Also reduce the default timeout and number of retries of boto so that it
fails more quickly in case of IaaS outage.
Merge branch 'master' into phantom0.2