Merge branch 'am-move-edition-metric-to-operational' into 'master'

Add GitLab edition and version metrics to Standard Category

See merge request gitlab-org/gitlab!67435

config/metrics/license/20210216175601_version.yml

 ---
-data_category: Optional
+data_category: Standard
 key_path: version
 description: Version of GitLab instance
 product_section: enablement

config/metrics/settings/20210216175604_edition.yml

 ---
-data_category: Optional
+data_category: Standard
 key_path: edition
 description: Edition of GitLab such as EE or CE
 product_section: enablement

doc/development/usage_ping/dictionary.md

@@ -8344,7 +8344,7 @@ Edition of GitLab such as EE or CE
 
 Group: `group::distribution`
 
-Data Category: `Optional`
+Data Category: `Standard`
 
 Status: `data_available`
 
@@ -23554,7 +23554,7 @@ Version of GitLab instance
 
 Group: `group::distribution`
 
-Data Category: `Optional`
+Data Category: `Standard`
 
 Status: `data_available`