svn merge -c 1457763 FIXES: HADOOP-9299.  kerberos name resolution is kicking in even when kerberos is not configured (daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457770 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd
Merge remote branch 'origin/branch-2-gd' into fb-YAHOO-226-branch-2-gd