Patch new Cmake/Tox + SonarQube templates