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

Following saltstack/salt-testing@de6a9692