Patch for hive trunk to work with tez trunk (0.5)