Discussion integration

Changes needed to make the discussion xblock work with the rebase.