Geo: Rename the old directory first when swapping out the recovered directory

If the main repository has files that cannot be purged with rm -rf due to permission errors of files inside the directory, the outdated repository will never recover. Renaming it to a different directory first will at least enable the recover mechanism to work. It does, however, mean the deleted directory will stick around.

Closes #4083 (closed)