svn merge -c 1507259 from trunk for HADOOP-9756. Remove the deprecated getServer(..) methods from RPC.