Simplify SSL configs and try and detect if CloudFlare Flexible SSL is used.
Merge branch 'master' into prod
Upgrading to Cedar-14
Merge branch 'master' into prod