Apply clang-format on some infrequently-updated files
Merge pull request #4933

20e01b1 Apply clang-format on some infrequently-updated files (Pieter Wuille)