Merge branch 'fix/project-import_url' of gitlab.com:gitlab-org/gitlab-ce into ce_upstrem_import-url-fix

# Conflicts:
#	lib/gitlab/import_url.rb