fix cleanup of untracked backup files
Currently fixes part of #5866 (closed) (see also !1336 (merged))
Closes #5945 (closed)
Closes #5956 (closed)
Currently fixes part of #5866 (closed) (see also !1336 (merged))
Closes #5945 (closed)
Closes #5956 (closed)