changes related to hive trunk + tez master