fresh copy of repository for proto v4 development

[SVN r44395]
merged from trunk

[SVN r49439]
merged from trunk

[SVN r49607]