avoid incompatible query when not using MySQL (fixes #3661, BP from #1984)
activity_data.body must not contain the null value (fixes #1984)
Merge remote-tracking branch 'ama/t-3661' into stable-3.6.x