Allow multiple servers to have same host/port but different server_name
Merge branch 'master' of github.com:rstudio/shiny-server