Jira fixed version 6
Fixes for new Jira version (6)