Merge branch 'cassandra-2.1' into trunk

build.xml

@@ -907,6 +907,9 @@
         <fileset dir="${build.dir}/tools/lib/">
             <include name="*.jar" />
         </fileset>
+        <fileset dir="${build.tools.lib}">
+            <include name="*.jar" />
+        </fileset>
       </copy>
       <artifact:writepom pomRefId="dist-pom" 
             file="${build.dir}/${final.name}-dist.pom"/>

debian/rules

@@ -46,7 +46,9 @@ install: build
 		usr/share/cassandra
 
 	# Copy stress jars
-	dh_install build/tools/lib/*.jar \
+	dh_install build/tools/lib/stress.jar \
+		usr/share/cassandra
+	dh_install tools/lib/*.jar \
 		usr/share/cassandra
 
 	dh_link usr/share/cassandra/apache-cassandra-$(VERSION).jar \