Merge "Move groupbasedpolicy Sonar scan to Sonarcloud"