Merge branches 'feature/project-export-ui-experimental' and...

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/import_service.rb

@@ -44,7 +44,7 @@ module Gitlab
       end
 
       def path_with_namespace
-        File.join(@namespace.path, @project_path)
+        File.join(@namespace.path, @shared.opts[:project_path])
       end
 
       def repo_path