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

<https://github.com/facebook/osquery/commit/a2017f68f16541a2dfcae17b151ba6feea0994fc|a2017f6>

Add clang-format rules from 3.6 (#2360) - Teddy Reed