Allow switching between oss and standard packages

Before only going from the standard package to oss was supported. Now
this works properly in both directions.

tasks/elasticsearch-Debian.yml

@@ -26,12 +26,10 @@
   when: es_use_repository
 
 
-- name: Gracefully stop and remove elasticsearch if we are switching to the oss version
-  when:
-    - es_package_name == 'elasticsearch-oss'
+- name: Gracefully stop and remove elasticsearch package if switching between OSS and standard
   block:
   - name: Check if the elasticsearch package is installed
-    shell: dpkg-query -W -f'${Status}' elasticsearch
+    shell: "dpkg-query -W -f'${Status}' {{ es_other_package_name }}"
     register: elasticsearch_package
     failed_when: False
     changed_when: False
@@ -43,13 +41,14 @@
       state: stopped
     when: elasticsearch_package.stdout == 'install ok installed'
 
-  - name: Debian - Remove elasticsearch package if we are installing the oss package
+  - name: Debian - Remove elasticsearch package if we are switching to a different package type
     become: yes
     apt:
-      name: 'elasticsearch'
+      name: '{{ es_other_package_name }}'
       state: absent
     when: elasticsearch_package.stdout == 'install ok installed'
 
+
 - name: Debian - Ensure elasticsearch is installed
   become: yes
   apt: