Enabled port collision auto-correction
Merge branch 'apache' into apache-php