Merge "salt.sh: Rework `git -C` for older git compat" into stable/euphrates