[osquery:master] 1 new commit by lxcode:

<https://github.com/facebook/osquery/commit/2f60dd0fd3ef5df9d19368c0d17d96990d088d1a|2f60dd0>

FreeBSD: Avoid clash with rapidjson (#3634) - lxcode