Merge branch 'stable-2.16' * stable-2.16: Support multiple Jira instances Change-Id: Ibd8ba989f4ffca8479e0b1c96528feaeefd9c2ff