Merge "log more info on fence sync_merge error" into jb-mr1-dev