Adding java to testserver configuration
Removing temp file
Merge commit