CXXFeatures: fix whitespace and one string compare
Merge topic 'cxx11' into next

6f148c3 CXXFeatures: fix whitespace and one string compare