rename Block::Id() to GetId(), make BlockManager::MakeId public
Merge branch 'master' into shred_preload