Merge branch '4.x-HBase-1.3' into omid2