Backported discussion XBlock to edx-solutions

PR for incorporating up-to-date discussion XBlock into edx-sokutions edx-platfirm