Fix persona login issue on Safari #1287.
Fix no forbidden message #1288
Merge remote-tracking branch 'origin/master' into 1279_es_upgrade