Fix merge conflict
Fix merge conflict

The changes in the share_speedup and the protobuf_updates branches
conflict semantically, even if not code wise. Fix that.

Change-Id: Iee82b0f4d552f9e9bac3ad9146c4ad82dc9c4d62

quattor/aquilon,stdweird/aquilon,stdweird/aquilon,stdweird/aquilon,quattor/aquilon,guillaume-philippon/aquilon,quattor/aquilon,guillaume-philippon/aquilon,guillaume-philippon/aquilon