Merge branch 'hotfix/0.11.0.11'
Fix a security vulnerability: eval used in quoting display name

This use of eval allows arbitrary remote code execution on
parsing of a maliciously formed email.

Two tests are updated to match the behaviour of the new
code to return the display name - these introduce extra
escaping, so should be innocous.
Remove obsolete comment.
Explicitly set I18n.locale in set_gettext_locale in order to get Rails to expire the template cache and trigger a lookup.
Merge branch 'hotfix/0.11.0.13' into rails-3-develop

Conflicts:
    spec/mailers/outgoing_mailer_spec.rb
Add a symlink to an httpd.conf file in the shared directory.