Merge "Add integration-tests to sonar for so"