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