Merge "Fixing bug 5011917 - clearing refernce to old folders from FolderInfo"