Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"
Reverting because of https://gitlab.com/gitlab-org/gitlab-ee/issues/4690
/cc @oswaldo
Reverting because of https://gitlab.com/gitlab-org/gitlab-ee/issues/4690
/cc @oswaldo