add gtest-1.7.0
delete gtest-1.5.0
cpp: switch gtest-1.5.0 to gtest-1.7.0
Merge remote-tracking branch 'upstream/master'
added 3rd OSD config for testing