Change the system tests to set Puma as default server only when the user haven't specified manually another server.
#31384

guilleiguaran wants to merge dont-override-server into master

We do not currently have an analysis of these two commits