Changed the wording, and removed the unused pkgs from mailer classes

EV-524
Reverted back to using c:out for close out reasons

EV-524
Merge remote-tracking branch 'github/feature/EV-524-wording-issues' into liferay6