Merge "Fix: Set tox-dir for rappcatalogue sonar scan"