v3006.21
Pyupgrade and drop six
Skip tests which can't run, or even pass on FIPS enabled platforms
Update code to be Py3.7+ to reduce merge forward conflicts
Allow cron.present to change a timespec from non-special to special
Fix strings
Merge remote-tracking branch 'upstream/3002.4'
Deprecate salt.utils.odict
Fix lint
Update and remove obsolete pylint plugins
Migrate `tests/unit/states/test_pip_state.py::PipStateInstallationErrorTest::test_importable_installation_error` to pytest
Update pre-commit hook versions
Stop using `@skipIf`
Skip zcbuildout tests