Merge "update to Fence::waitForever() API change" into jb-mr2-dev