Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6.
5dbf1809c6
(cherry picked from commit 39114178a0)
39114178a0