Merge branch 'trunk-gd' of https://github.com/griddynamics/yhadoop-common into fb-YAHOO-214-trunk-gd

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestShortCircuitLocalRead.java