Merge branch 'backport-ee-import-url-rescue' into 'master'

Backport rescue in Project#import_url from EE

See merge request gitlab-org/gitlab-ce!22520

app/models/project.rb

@@ -688,6 +688,8 @@ class Project < ActiveRecord::Base
     else
       super
     end
+  rescue
+    super
   end
 
   def valid_import_url?