allow ssl to be enabled
Merge branch 'apache_ssl'