And as a prerequisite for that testcase, I needed to implement DR 1004, 
dropping the pedwarn about using an injected class name as a template 
template parameter.

Tested x86_64-pc-linux-gnu, applying to trunk.