merging from upstream WebGoat

Merge remote-tracking branch 'upstream/master'

src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java

@@ -523,6 +523,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
             // System.out.println("Solution: " + getLessonSolutionFileName());
             src = readFromFile(new BufferedReader(new FileReader(getLessonSolutionFileName())), false);
         } catch (Exception e) {
+            logger.error("Could not find solution for {}", getLessonSolutionFileName());
             s.setMessage("Could not find the solution file");
             src = ("Could not find the solution file or solution file does not exist.<br/>"
                     + "Send this message to: <a href=\"mailto:" + s.getWebgoatContext().getFeedbackAddress()

src/main/java/org/owasp/webgoat/session/Course.java

@@ -315,7 +315,7 @@ public class Course {
                     lesson.setLessonPlanFileName(lessonPlan.getKey(), lessonPlan.getValue().toString());
                 }
                 if (plugin.getLessonSolution("en").isPresent()) {
-                    lesson.setLessonSolutionFileName(plugin.getLessonSolution("en").toString());
+                    lesson.setLessonSolutionFileName(plugin.getLessonSolution("en").get().toString());
                 }
                 if (plugin.getLessonSource().isPresent()) {
                     lesson.setSourceFileName(plugin.getLessonSource().get().toString());