Jira 6.0.8 compatibility

Did some changes to make tests work with JIRA 6.0.8.