Convert the int to long.
Merge remote-tracking branch 'origin/hbase-11339-core-integration-test' into hbase-11339-core-integration-test-test