Adding wait/wait_timeout parameters to the ec2_key module

Fixes #6455