Fix merge conflicts JIRA CE to EE

Closed Drew Blessing requested to merge dblessing/gitlab-ee:jira_merge_conflicts into master

A merge of the JIRA CE changes that resolves conflicts that should make the normal CE to EE merge easier.