Test improvements for xpack + httplib2 support

tasks/xpack/elasticsearch-xpack.yml

@@ -23,11 +23,10 @@
     CONF_DIR: "{{ conf_dir }}"
     ES_INCLUDE: "{{ instance_default_file }}"
 
-
-- name: Set Plugin Directory Permissions
-  file: state=directory path={{ es_home }}/plugins owner={{ es_user }} group={{ es_group }} recurse=yes
-
-- include: elasticsearch-shield.yml
+- include: shield/elasticsearch-shield.yml
   when: '"shield" in es_xpack_features'
 
-#Any other xpacks plugins requiring configuration to be entered here
+#Any other xpacks plugins requiring configuration to be entered here
+
+- name: Set Plugin Directory Permissions
+  file: state=directory path={{ es_home }}/plugins owner={{ es_user }} group={{ es_group }} recurse=yes

tasks/xpack/shield/elasticsearch-shield.yml

@@ -37,7 +37,6 @@
   notify: load-native-realms
   when: (es_users is defined and es_users.native is defined) or (es_roles is defined and es_roles.native is defined)
 
-
 #Ensure shield conf directory is created
 - name: Ensure shield conf directory exists
   file: path={{ conf_dir }}/shield state=directory owner={{ es_user }} group={{ es_group }}