Bug 977371 - Allow more than 2^20 blockids (r=jorendorff)