Fix errors in discussion xmodule

This addresses: https://openedx.atlassian.net/browse/TNL-606
@cahrens I had issued by mistake a PR of my branch against master not the release candidate. Sorry. Closed this.

The right PR is https://github.com/edx/edx-platform/pull/5554