Merge proposals dependent on lp://qastaging/~michihenning/unity-scopes-api/gtest-fixes

lp://qastaging/~michihenning/unity-scopes-api/gtest-fixes has no merge proposals.