Squashed 'src/machinetalk/proto/' changes from f6cca1c..1d0d06c

1d0d06c machinetalk-protobuf: fixed wrong field id

git-subtree-dir: src/machinetalk/proto
git-subtree-split: 1d0d06c289d12b3631215a221b09b86bbacede7b
Merge commit 'f622f0b67e91b02a4b169230327be5c349fa0b21' into mkwrapper