Merge changes I215bf219,I1d0a79e7 into studio-1.4-dev

* changes:
  Convert TestServerTask to Java.
  Rename TestServerTask to Java.