[osquery:master] 1 new commit by Javier Marcos:

<https://github.com/facebook/osquery/commit/d2e7295462cdd5fd990b181991263add4729d1ff|d2e7295>

Catch exception when parsing carbon black ini/settings file (#2972) - Javier Marcos