SONAR-4397 Minor label changes and default groups for dryrun and scan