Merge #10602: Make clang-format use C++11 features (e.g. A<A<int>> instead of A<A...