Merge branch 'test-basic-import' into 'master'

Add basic export to fix timeout problem on import_file_spec.rb

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