Support 'error' and 'body_file' return attribs in 'message_before_send' hook (#1489595)

Conflicts:

	CHANGELOG