Merge branch '7.1' into tb3

diff --cc uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index d5e7273b77d8157977726f5d946d13fee4adcf8b,99f9707479a8eaf34d6925e5805e2d1a71faa0ba..c2cf421f4a60022c411323360465ebc3539ec2a3
--- 1/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
--- 2/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@@ -24,11 -24,10 +24,12 @@@ import java.net.ServerSocket
  import java.net.Socket;
  import java.text.SimpleDateFormat;
  import java.util.Calendar;
 +import java.util.EnumSet;
  import java.util.HashMap;
  import java.util.Map;
+ import java.util.Map.Entry;
  
 +import javax.servlet.DispatcherType;
  import javax.servlet.Filter;
  import javax.servlet.FilterChain;
  import javax.servlet.FilterConfig;