Merge pull request #1 from saltstack/develop

Pull in latest upstream.
Find key file via profile config on destroy the same way it is found on create.
Merge pull request #12040 from JustinHead/develop

Use cloud profile to determine key on delete