Add workaround for importing key pairs that already exist
Merge branch 'master' into phantom0.2