Merge pull request #4960 from edx/split/html_id

Update opaque-keys library to use block_id for html_id for new keys.
Use opaque_keys w/ model vars not parsing of url
to generate url.
LMS-11209