Merge remote-tracking branch 'upstream/master'

Merge from upstream.
Merge branch 'master' of github.com:liyong1214/hbase