Fix for Site 'SMTP retention' is not in resource file (Issue #3301) and #3304 Users 'Import Users' resource