Merge branch 'qcc-8-cxx-lang-flag-3.31' into qcc-8-cxx-lang-flag

* qcc-8-cxx-lang-flag-3.31:
  QCC-CXX: use `-x c++` on 8+