svn merge -c 1311738 from trunk. FIXES HADOOP-8264. Remove irritating double double quotes in front of hostname (Bernd Fondermann via bobby)