apache_port now used as default for all domain / subdomain vhosts. sentora_port is used as the panel port.
Merge origin/master