Xblock discussion sync

This contains the work for the xblock-discussion changes.