Mlhr 1544

This branch has squashed commit of Hive-HDFS.