Change how null is compared
Refine the code.
Fix the issues in JIRA build
merge from hbase-11339-core