Renamed templates to have same name as discussion XBlock templates
Merged LMS discussion templates to discussion XBlock
Fixed post-merge errors