HADOOP-6398. svn merge -c 885534 from trunk to branch 0.21

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@885555 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -616,6 +616,8 @@ Trunk (unreleased changes)
     HADOOP-6395. Upgrade some libraries to be consistent across common, hdfs,
     and mapreduce. (omalley)
 
+    HADOOP-6398. Build is broken after HADOOP-6395 patch has been applied (cos)
+
   OPTIMIZATIONS
 
     HADOOP-5595. NameNode does not need to run a replicator to choose a

src/test/aop/build/aop.xml

@@ -18,7 +18,7 @@
   <property name="build-fi.dir" value="${basedir}/build-fi"/>
   <property name="hadoop-fi.jar" location="${build.dir}/${final.name}-fi.jar" />
   <property name="compile-inject.output" value="${build-fi.dir}/compile-fi.log"/>
-  <property name="aspectversion" value="1.6.4"/>
+  <property name="aspectversion" value="1.6.5"/>
   <property file="${basedir}/build.properties"/>
 
   <!--All Fault Injection (FI) related targets are located in this session -->