Regen descriptor protobuffs to be compatible with 2.5
Merge pull request #4 from andrewlmurray/master

Regen descriptor protobuffs to be compatible with 2.5