This also fixes http://dev.plone.org/plone/ticket/11098 svn path=/plone.app.discussion/trunk/; revision=40431
svn path=/plone.app.discussion/trunk/; revision=40373
svn path=/plone.app.discussion/trunk/; revision=40357