Added 5 seconds timeout to import keypair test to accomodate Crome driver.
Merge remote-tracking branch 'origin/master'