Fixing behaviour in documents when rename nothing or overwrite is selected -refs #6863