merge from intel-hadoop