Merge pull request #7061 from s0undt3ch/0.16-merge

Following saltstack/salt-testing@de6a9692
Merge pull request #7066 from s0undt3ch/0.16-merge

Check separately, the order can change.
Old ssh clients require -t for ssh-keyscan
Use .get() on the grains dict
Non zero exit codes should be considered errors.