Parallize file moving and LS accounting. Also re-add time-out for file closing.
Add comment.
Merge remote-tracking branch 'origin/master' into BUtests