The raw list of candidate SHAs to backport is:

82c6c2a
92311d9
314a22e
b66e993
05c1738
ade79fb

However, 92311d9 doesn't need to be applied, and the three following are all clang-format related. Integrating clang-format with the legacy driver is a separate ticket (see CXX-632). That leaves ade79fb.

So, the actual backport list is:
82c6c2a
ade79fb