diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 0c1a40e2a66..1de092f3daf 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -76,10 +76,6 @@ ENV FINDBUGS_HOME /opt/findbugs
 RUN apt-get install -y cabal-install
 RUN cabal update && cabal install shellcheck --global
 
-# Fixing the Apache commons / Maven dependency problem under Ubuntu:
-# See http://wiki.apache.org/commons/VfsProblems
-RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar .
-
 ###
 # Avoid out of memory errors in builds
 ###
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 247124f0e5c..310f2dee021 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -883,6 +883,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12636. Prevent ServiceLoader failure init for unused FileSystems.
     (Inigo Goiri via cdouglas)
 
+    HADOOP-12681. start-build-env.sh fails in branch-2.
+    (Kengo Seki via aajisaka)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES