fix critical point issues
Merge branch 'hbase' of https://github.com/Huawei-Spark/spark into hbase
merge from the master