Fix stack popping

Author: maple-buice

src/main/java/com/hubspot/jinjava/lib/tag/FromTag.java

@@ -125,8 +125,8 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
         );
       }
     } finally {
+      interpreter.getContext().popFromStack();
       interpreter.getContext().getCurrentPathStack().pop();
-      interpreter.getContext().getImportPathStack().pop();
     }
   }
 

src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerFromTag.java

@@ -137,8 +137,8 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
         );
       }
     } finally {
+      interpreter.getContext().popFromStack();
       interpreter.getContext().getCurrentPathStack().pop();
-      interpreter.getContext().getImportPathStack().pop();
     }
   }