Merge pull request #730 from Yangqing/sweep

cosmetics: add syntax = proto2