OP-1350 fix build for revoproto and discoveryf4