[c++-concepts] MErge from trunk

[Gabriel Dos Reis]

at revision 201992.
There were conflicts with the recent pretty printing patches.
Fixed.  (Mostly due to the new concept-specific nodes printing.)
Modulo the asan stuff.

-- Gaby