Merge "Major Sonar fixes in E2EServiceInstances"