Made changes to fit JIRA 6.1