Moving MAPREDUCE-4678's changes line to 0.23 section to prepare for backport.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433409 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4925. The pentomino option parser may be buggy. Contributed by Karthik Kambatla. (harsh)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433414 13f79535-47bb-0310-9956-ffa450edef68