Update the Apache server configs

Include the latest changes from v2.5.0.
Use character entity references more consistently
Don't initialize variable to `undefined`.

Also follow the same scheme for if clause.