svn merge -c 1548161 FIXES: HDFS-5514. FSNamesystem's fsLock should allow custom implementation (daryn)


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