More JIRA sync fixes

Change-Id: Iefa0a486ceacfde6f30ce169923526e1c2eeba55
Merge "More JIRA sync fixes" into release-0.15