Merge branch 'hotfix/authenticate-and-expire-download-zips'
Latest translations from Transifex.
Merge branch 'hotfix/0.6.8-last-translations'
Handle case where info request doesn't have a user_name
Don't export the fake authorities that we use for admin.
Rails security update.
Security update for newrelic
Merge branch 'hotfix/0.6.8.3' into develop

Conflicts:
    Gemfile.lock
    locale/ar/app.po
    locale/cs/app.po
    locale/cy/app.po
    locale/en_IE/app.po
    locale/es/app.po
    locale/pt_BR/app.po
Latest translations pulled from Transifex to fix inadvertantly committed unmerged conflicted files.
Switched to a forked version of rails_xss that includes a fix we need
Revert "Switched to a forked version of rails_xss that includes a fix we need"

This reverts commit 0f0b36c8883605dbe0cfc663a7b046f3a1a8d196.
Revert "Assume the result of doing any translation is html_safe"

This reverts commit 493e8e7ec43351952e2d7876afaede0cdb5d3644.
As we're validating filename with validates_presence_of, which doesn't allow blanks, ensure_filename! should populate a default filename on a blank filename, as well as on nil.
Switch from unofficial rails_xss gem to official rails plugin for rails_xss
Layouts for text emails should not escape their contents
Don't escape text emails
More small html escaping fixes
Added comment about the syntax of the interpolations in the translations
Fix translations with interpolations to correctly handle safe_html
More escaping fixes