[osquery:master] 1 new commit by Teddy Reed:

<https://github.com/facebook/osquery/commit/f29de27649db683ae1ef0084d28aca8886737fc6|f29de27>

Combine osqueryi and osqueryd into single binary (#2742) - Teddy Reed