(cherry picked from commit 56d85a5a)

(cherry picked from commit b0b42ae0)

This will make it easier to debug such problems in the future.
(cherry picked from commit 8c869919)

Defense in depth - run some vars through |escape, although we know that currently they're safe vars.

Conflicts:

	htdocs/artefact/blog/theme/default/render/blogpost_renderfull.tpl

Force profileicon upgrade to fail if dataroot/artefact/file/profileicons directory exists; don't try to delete profileicon artefacts without files on disk

Change user message notification url to allow replies
Quote original message when sending a user message as a reply

Add auth_handle_institution_expiries, email site and institutional admins, suspend institutions if we are allowed to automatically do so.