Merge OS-specific variables for ubuntu

Now that we are using systemd everywhere, for xenial++ there isn't a
need to release specific settings.

Change-Id: I41567021ccb1fe86016278f52b3f0b4356fce363
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

tasks/main.yaml

@@ -13,7 +13,7 @@
 # under the License.
 ---
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}.yaml"
+  include_vars: "{{ ansible_distribution|lower }}.yaml"
   when: ansible_os_family == 'Debian'
 
 - name: Include OS-specific variables.