fix internal messages with LF in them

Thanks to Ahto Truu for spotting this problem.
Merge branch 'v7-stable' into v7-devel

Conflicts:
	plugins/imptcp/imptcp.c
Merge branch 'v7-devel'