Rename BlockUsageLocator's block_id field from usage_id
usage_id implies self-sufficiency. The block_id is relative to its structure.
Improve test coverage
and fix found errors.
Merge pull request #1980 from edx/dhm/locator_block_id

Rename BlockUsageLocator's block_id field from usage_id