backport test improvements from develop Bogus random test failures forklifted from develop at 414bfe61a4fbe6f84be32242924f23c7126c24d6
backport test improvements from develop
Bogus random test failures
forklifted from develop at 414bfe61a4fbe6f84be32242924f23c7126c24d6

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt