Merge pull request #7057 from s0undt3ch/0.16-merge

Some more 0.16 test case cherry picks
Merge pull request #7059 from s0undt3ch/0.16-merge

0.16 Suse user tests fixes
Following saltstack/salt-testing@de6a9692