update with apache/master and minor format fix

Hi, In this PR i do something as follows
1 update with apache/master and fix conflicts 
2 code formate fix according community style
3 revert changes that should not be made in our branch

And furthermore i suggest that be careful to change code not in hbase module,  if we need change them please add comments to explain why.