Added ability to locate whitelist text at bottom of e-mail.  Added instance, install_class, and servername to all e-mails, whether blast e-mail or otherwise.  Resolves #7423
Added smtp.whitelist.location.  Refs #7423
Merge branch 'dev' into test