Fixes for new Jira version (6)
Revert "Fixes for new Jira version (6)"

This reverts commit 565e84053cf203086ae8c14379ad92ebda47835b.