CriticalPoint: enhamcement 2
Merge branch 'hbase' of https://github.com/Huawei-Spark/spark into hbase
fix some deprecation/styple issues