Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6.
5dbf1809c6
(cherry picked from commits 790f629e5e and 8b7a86ec7b)
790f629e5e
8b7a86ec7b