Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/jettyex/JettyWebApplication.java
#	spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/TestController.java

spring-session/tomcat-session-demo/pom.xml

@@ -32,6 +32,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>