Spliting test server in a unique task to use in testling
Merge branch 'master' into testling

* master:
  Spliting test server in a unique task to use in testling
Server