Merge pull request #7965 from jordan-woyak/condvar-fixes Minor changes to usages of std::condition_variable.
