Resolved conflicts:
- app/workers/all_queues.yml
- config/sidekiq_queues.yml
- spec/lib/gitlab/import_export/all_models.yml

CE MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19480
EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6611