svn merge -c 1459573 from trunk for HDFS-4607.  In TestGetConf.testGetSpecificKey(), use a platform-specific line separator; otherwise, it fails on Windows.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459574 13f79535-47bb-0310-9956-ffa450edef68