Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-shield into doc-feedback

Conflicts:
	docs/public/clients/java.asciidoc

Original commit: elastic/x-pack-elasticsearch@6478165c72

.esvm-shield-config/roles.yml

@@ -1,13 +1,13 @@
 admin:
   cluster: all
   indices:
-    '.*': all
+    '*': all
 
 power_user:
   cluster: monitor
   indices:
-    '.*': all
+    '*': all
 
 user:
   indices:
-    '.*': read
+    '*': read

pom.xml

@@ -152,7 +152,12 @@
 
 
     <build>
-
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>