_s: Use comment_reply_link arguments to wrap reply link

Avoid empty div if no reply link
Merge branch 'master' into ja