removing the depreciation warning when calling key_pair from an aws server
Merge remote-tracking branch 'upstream/master'
Merge pull request #3104 from techlunacy/master

updating the key_pair method call from the aws server model