Backport changes from EE for RegisterBuildService
Reduce conflicts from CE to EE, see: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8084#note_21727977
Would create a corresponding EE merge request
/cc @jameslopez
Reduce conflicts from CE to EE, see: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8084#note_21727977
Would create a corresponding EE merge request
/cc @jameslopez