This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.

# Conflicts:
#	.rubocop.yml
#	.rubocop_todo.yml
#	lib/gitlab/ci/config/entry/global.rb
#	lib/gitlab/ci/config/entry/jobs.rb
#	spec/lib/gitlab/ci/config/entry/factory_spec.rb
#	spec/lib/gitlab/ci/config/entry/global_spec.rb
#	spec/lib/gitlab/ci/config/entry/job_spec.rb
#	spec/lib/gitlab/ci/status/build/factory_spec.rb
#	spec/lib/gitlab/incoming_email_spec.rb

This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9021#note_23782188

This is discovered by
https://gitlab.com/gitlab-org/gitlab-ce/builds/10815456

I removed `gl_project_id` and this is failing. I took some look,
realizing that:

* `trace` is duplicated in `attributes`
* `tag_list` is not included in `build.attributes`
* `artifacts_expire_at` is missing in `attributes`

So we need to:

* Remove duplicated `trace` in `attributes` (40 -> 39)
* Remove `tag_list` in `attributes` (39 -> 38)
* Add `artifacts_expire_at` to `attributes` (38 -> 39)
* Add `gl_project_id` to `attributes` (39 -> 40)