fixed test fileMerger for java8
Merge branch 'fJava8' into fLoginGui