XBlock Discussion changes

All discusion changes, rebased. CC @antoviaque