build: downgrade xblocks-contrib

The renaming is causing some conflicts and causing tests to fail.
Pulling the update from this generic upgrade PR.