Adjust efDoDiscussionLink() after changes in core

I6a6c12a9, Id27555c6.

Change-Id: If346eec85f33b4f5a3ca292375698dea57fcb6a3
Merge "Adjust efDoDiscussionLink() after changes in core"