svn merge -c 1327108 from trunk. FIXES: HADOOP-8286. Simplify getting a socket address from conf (Daryn Sharp via bobby)