Fixes BB-1547: Improve rules on email after comment on wall post
Merge remote-tracking branch 'upstream/master' into bb-1547