Fix Farsi handling

Incorporating changes from https://github.com/berkmancenter/robustness_nginx/commit/3538a978f7c6f05a98a1db1b87f68fbe5c68448d and https://github.com/berkmancenter/robustness_nginx/commit/657a0e77e6dce1aa9aa91174c5b2c350697632a5
Merge branch 'master' of github.com:berkmancenter/robustness_drupal
Rename CAYL to Amber