Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

lib/gitlab/import_export/project_tree_restorer.rb

@@ -51,7 +51,7 @@ module Gitlab
       end
 
       def default_relation_list
-        Gitlab::ImportExport::ImportExportReader.new(shared: @shared).tree.reject do |model|
+        Gitlab::ImportExport::Reader.new(shared: @shared).tree.reject do |model|
           model.is_a?(Hash) && model[:project_members]
         end
       end