dependencies updated for JIRA 6.1.3 compatibility. Fixed imports.
Merge branch 'dbr23-JIRA_6.1.3_update'