Fix detection of g++ for coverity
Merge branch 'master' into coverity_scan

* master:
  Fix detection of g++ for coverity