Fix propagate service spec transient failure
Seen in https://gitlab.com/gitlab-org/gitlab-ce/builds/16902855
Port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1914 into master
Seen in https://gitlab.com/gitlab-org/gitlab-ce/builds/16902855
Port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1914 into master