Merge branch 'cherry-pick-18b3646a' into 'release-22.1'

release-22.1:Backport!6403

See merge request !6404

ansible/system_roles/consul/tasks/service_config_set.yml

 ---
 - name: import path to control repo
-  include_vars: "vars/{{ ansible_distribution }}.yml"
+  include_vars: "vars/{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml"
+
 
 - name: Register a key/value pair for {{ consul_service_key }}
   consul_kv: