Merge pull request #2 from saltstack/develop

Pull in latest upstream.
Update the removal of the key to use the corrected key_file var.
Merge pull request #12047 from JustinHead/develop

Update the key removal to use the corrected key_file variable