upgrade jira and remote rivers
Revert "upgrade jira and remote rivers"

This reverts commit 9ae01320db360de87df0e9151715daf313a66f08.
upgrade jira and remote rivers
Merge branch 'master' into mailing_list_7