CXXFeatures: clean up test
Merge topic 'cxx11' into next

b5ec5b8 CXXFeatures: clean up test