HADOOP-4610. Reflect commit to 0.18.3 in trunk.
HADOOP-4610. Reflect commit to 0.18.3 in trunk.

git-svn-id: 5be3658b1da2303116c04834c161daea58df9cc4@712339 13f79535-47bb-0310-9956-ffa450edef68

awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop