Fixed the jira4 branch after merging the master.