Merge "Make ApiQueryUserInfo::getBlockInfo accept an AbstractBlock"