Backport of gitlab-org/gitlab-ee!6876
What does this MR do?
Backport of the relevant CE bits for the Jira integration fix in gitlab-org/gitlab-ee!6876
What are the relevant issue numbers?
gitlab-org/gitlab-ee!6876
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated -
Tests added for this feature/bug -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
Conforms to the database guides
Edited by Mario de la Ossa