Merge #18194 &  move `salt.utils.six` to `salt.ext.six`

Merge #18194 &  move `salt.utils.six` to `salt.ext.six`