Rebase fixes

Author: cgivre

exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/JsonLoaderImpl.java

@@ -25,7 +25,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
+import io.netty.buffer.DrillBuf;
 import org.apache.drill.common.exceptions.CustomErrorContext;
 import org.apache.drill.common.exceptions.EmptyErrorContext;
 import org.apache.drill.common.exceptions.UserException;