Greater timeouts for moving and renaming folders
Merge remote-tracking branch 'origin/move_files_and_folders' into move_files_and_folders