webclient: add a mark that this is a test server
Merge remote-tracking branch 'remotes/origin/master'