diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index e1fff8a..627451c 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -46,16 +46,15 @@
 RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar .
 
 #######
-# Oracle Java
+# Java OpenJDK
 #######
 
 RUN apt-get install -y software-properties-common
 RUN add-apt-repository -y ppa:webupd8team/java
 RUN apt-get update
 
-# Auto-accept the Oracle JDK license
-RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
-RUN apt-get install -y oracle-java8-installer
+# Install OpenJDK 7
+RUN apt-get install -y openjdk-7-jdk
 
 ######
 # Install findbugs
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 9a5770c..248bfb6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -22,6 +22,9 @@
     YARN-7590. Improve container-executor validation check.
     Contributed by Eric Yang.
 
+    HADOOP-14842. Hadoop 2.8.2 release build process get stuck due to java
+    issue. Contributed by Junping Du.
+
 Release 2.6.5 - 2016-10-08
 
   INCOMPATIBLE CHANGES
@@ -4368,7 +4371,7 @@
 
    HADOOP-7841. Run tests with non-secure random. (tlipcon)
 
-    HADOOP-7851. Configuration.getClasses() never returns the default value. 
+    HADOOP-7851. Configuration.getClasses() never returns the default value.
                  (Uma Maheswara Rao G via amarrk)
 
    HADOOP-7787. Make source tarball use conventional name.