Refactor and test config-router-util.
Merge branch 'master' of github.com:rstudio/shiny-server
Merge branch 'master' of github.com:rstudio/shiny-server