Merge "Set $_SERVER['SERVER_NAME'] to the value set by --server"