Merge "Make v2 create_user_ec2_credentials  use **kwargs"