When saving a file with --no-clobber, make sure the existing file name remains set when creating the name fails. In a retry scenario, it comes back and uses that variable again. Add test 3036 to verify. Reported-by: James Fuller Closes #20939
