Update SSL configs for Apache
Merge branch 'web_server'