svn merge -c 1512057 merging from trunk to branch-2 to fix HDFS-5047. Supress logging of full stack trace of quota and lease exceptions.