Update bug report template for 2.1 (#18816)

Co-authored-by: Jirka <[email protected]>
(cherry picked from commit 1210deb)

Author: 2 people

.github/ISSUE_TEMPLATE/1_bug_report.yaml

@@ -32,11 +32,10 @@ body:
       description: select all version where you have experienced this issue
       multiple: true
       options:
-        - "v1.6"
-        - "v1.7"
         - "v1.8"
         - "v1.9"
         - "v2.0"
+        - "v2.1"
         - "master"
     validations:
       required: true

.github/advanced-issue-labeler.yml

@@ -13,6 +13,8 @@ policy:
           - name: "ver: 1.9.x"
             keys: ["v1_9", "v1.9", "1.9.x"]
           - name: "ver: 2.0.x"
-            keys: ["v2_0", "v2.0", "2.0+"]
+            keys: ["v2_0", "v2.0", "2.0.x"]
           - name: "ver: 2.1.x"
+            keys: ["v2_1", "v2.1", "2.1.x"]
+          - name: "ver: 2.2.x"
             keys: ["master"]