Merge remote-tracking branch 'elasticsearch/master'

Conflicts:
	pom.xml

Author: dadoonet

pom.xml

@@ -129,8 +129,9 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
+                <version>2.2.2</version>
                 <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
                     <outputDirectory>${project.build.directory}/releases/</outputDirectory>
                     <descriptors>
                         <descriptor>${basedir}/src/main/assemblies/plugin.xml</descriptor>

src/main/assemblies/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <assembly>
-    <id></id>
+    <id>plugin</id>
     <formats>
         <format>zip</format>
     </formats>