Skip certain tests if necessary and mark some flaky ones

[meaksh]

What does this PR do?

In our efforts testing SL Micro 6.0, this PR just fixes a couple of more tests which produces errors in some situations. It also marks some detected tests as flaky.

Upstream PR: https://github.com/saltstack/salt/pull/66630

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

• [ ] Docs
• [ ] Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
• [x] Tests written/updated

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.