Fix merge conflicts JIRA CE to EE
A merge of the JIRA CE changes that resolves conflicts that should make the normal CE to EE merge easier.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
A merge of the JIRA CE changes that resolves conflicts that should make the normal CE to EE merge easier.