merging b872ab8...fiixes for context processing of discussion-forum block.
merging b872ab8...fiixes for context processing of discussion-forum block.

edx-solutions/edx-platform,edx-solutions/edx-platform,edx-solutions/edx-platform,edx-solutions/edx-platform