Remove empty lines between labels in email notifications.

Also add test for email formatting.

Change-Id: I309018b021730dee80f9f5bd05eb1a96bf0d237e