Merge "Fix sonar integration test reporting"