CXXFeatures: fix elseif()
Merge topic 'cxx11' into next

7b140e6 CXXFeatures: fix elseif()