fixes #2122
Merge pull request #2144 from dotCMS/issue-2122-email-notification-from-Files-fields-are-sending-code-from-files-master25

fixes #2122
Merge remote-tracking branch 'origin/master' into issue-2147-remote-pub-portlet-permissions