merge with trunk

src/main/java/com/salesforce/phoenix/coprocessor/HashJoinRegionScanner.java

@@ -29,6 +29,8 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
@@ -42,7 +44,9 @@
 import org.apache.hadoop.hbase.util.Bytes;
 
 import com.salesforce.hbase.index.util.ImmutableBytesPtr;
-import com.salesforce.phoenix.cache.*;
+import com.salesforce.phoenix.cache.GlobalCache;
+import com.salesforce.phoenix.cache.HashCache;
+import com.salesforce.phoenix.cache.TenantCache;
 import com.salesforce.phoenix.expression.Expression;
 import com.salesforce.phoenix.join.HashJoinInfo;
 import com.salesforce.phoenix.join.ScanProjector;