Updated ServerName config files to apache 2.4 format
Updated ServerName conf from master