Merge remote-tracking branch 'upstream/master'
[Cloudfront] Exclusion for Amazon mp3s

https://trac.torproject.org/projects/tor/ticket/9367
[UKLocalGov] Add havering.gov.uk
[UKLocalGov] Remove reading rule, see #8783
Merge remote-tracking branch 'upstream/master'
Prepare for switching accidental dev users to stable

The 3.3.2 release had a bug that accidentally put some
percentage of stable users in the develoment branch. They
then updated to 4.0development.10. We need to push a
4.0development.11 release that detects which users used
to be on the stable branch and gives them a popup asking
them if they would like to go back to stable.
Open dev downgrade prompt in tab instead of window
Add features to downgrade-to-stable popup
UI improvements to popup
Uncomment popup shown pref change
[LiveJournal] Add/update/amend comments
[LiveJournal] Chrome friendliness
[LiveJournal] Uncomment journal entries rule

Works again (for now....)
[LiveJournal] Cosmetics
[iPage] Add comments
[iPage] Remove platform

Just custom fonts.
[iPage] Add coverage
[VTunnel] Don't force !www
[M2pub.com] Fix

As per comment.
[VTunnel] Add comments