--- old/test/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java	2016-07-06 19:16:45.615386615 +0300
+++ new/test/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java	2016-07-06 19:16:45.523386613 +0300
@@ -24,8 +24,8 @@
 package compiler.compilercontrol.share.scenario;
 
 import compiler.compilercontrol.share.method.MethodDescriptor;
+import compiler.compilercontrol.share.pool.PoolHelper;
 import jdk.test.lib.Pair;
-import pool.PoolHelper;
 
 import java.lang.reflect.Executable;
 import java.util.ArrayList;
@@ -33,7 +33,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.Callable;
 
 /**