Merge "Enable sonar code coverage with oparent"