This commit depends on edx-platform commit 887bcb5 and
cs_comments_service commit f78fdd9.

Co-authored-by: jsa <jsa@edx.org>