WL-3478 Announcements Email contains unreplaced parameter

2 things:
   1. For HTML email content, we were missing out the service title.
   2. For text email content, we were putting in the base URL rather than the site's hierarchy URL.