merge from cloudera

merge from cloudera