diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
index e77f97370e6..4939fea57a8 100644
--- a/gui/admin-gui/pom.xml
+++ b/gui/admin-gui/pom.xml
@@ -803,7 +803,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ConstructionWrapperFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ConstructionWrapperFactory.java
index b537fedcfbd..bad5b1cce41 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ConstructionWrapperFactory.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ConstructionWrapperFactory.java
@@ -57,6 +57,9 @@ public PrismContainerValueWrapper<ConstructionType> createContainerValueWrapper(
         }
 
         ObjectReferenceType resourceRef = constructionType.getResourceRef();
+        if (resourceRef.getOid() == null) {
+            return constructionValueWrapper;
+        }
 
         PrismObject<ResourceType> resource = null;
         try {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
index c68c824a9ad..601f5a66d01 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
@@ -24,9 +24,16 @@
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementWebServerFactoryCustomizer;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.autoconfigure.web.embedded.JettyWebServerFactoryCustomizer;
+import org.springframework.boot.autoconfigure.web.embedded.NettyWebServerFactoryCustomizer;
+import org.springframework.boot.autoconfigure.web.embedded.TomcatWebServerFactoryCustomizer;
+import org.springframework.boot.autoconfigure.web.embedded.UndertowWebServerFactoryCustomizer;
+import org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerFactoryCustomizer;
 import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryCustomizer;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -39,6 +46,7 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.context.annotation.Profile;
+import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -169,39 +177,30 @@ public void invalidExpiredSessions() {
 
     @Component
     @EnableConfigurationProperties(ServerProperties.class)
-    public class ServerCustomization implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
+    public class ServerCustomization implements WebServerFactoryCustomizer<MidPointTomcatServletWebServerFactory> {
 
         @Value("${server.servlet.session.timeout}")
         private int sessionTimeout;
         @Value("${server.servlet.context-path}")
         private String servletPath;
 
-        @Value("${server.use-forward-headers:false}")
-        private Boolean useForwardHeaders;
-
-        @Value("${server.tomcat.internal-proxies:@null}")
-        private String internalProxies;
-
-        @Value("${server.tomcat.protocol-header:@null}")
-        private String protocolHeader;
-
-        @Value("${server.tomcat.protocol-header-https-value:@null}")
-        private String protocolHeaderHttpsValue;
-
-        @Value("${server.tomcat.port-header:@null}")
-        private String portHeader;
-
         @Autowired
         private ServerProperties serverProperties;
 
         @Autowired
         private TaskManager taskManager;
 
+        @Autowired
+        private Environment env;
+
+
         @Override
-        public void customize(ConfigurableServletWebServerFactory serverFactory) {
+        public void customize(MidPointTomcatServletWebServerFactory serverFactory) {
 
-            ServletWebServerFactoryCustomizer servletWebServerFactoryCustomizer = new ServletWebServerFactoryCustomizer(serverProperties);
-            servletWebServerFactoryCustomizer.customize(serverFactory);
+            ServletWebServerFactoryCustomizer webServletWebServerFactoryCustomizer = new ServletWebServerFactoryCustomizer(serverProperties);
+            webServletWebServerFactoryCustomizer.customize(serverFactory);
+            TomcatWebServerFactoryCustomizer tomcatWebServerFactoryCustomizer = new TomcatWebServerFactoryCustomizer(env, serverProperties);
+            tomcatWebServerFactoryCustomizer.customize(serverFactory);
 
             serverFactory.addErrorPages(new ErrorPage(HttpStatus.UNAUTHORIZED, "/error/401"));
             serverFactory.addErrorPages(new ErrorPage(HttpStatus.FORBIDDEN, "/error/403"));
@@ -214,47 +213,24 @@ public void customize(ConfigurableServletWebServerFactory serverFactory) {
             serverFactory.setSession(session);
 
             if (serverFactory instanceof TomcatServletWebServerFactory) {
-                customizeTomcat((TomcatServletWebServerFactory) serverFactory);
+                TomcatContextCustomizer contextCustomizer = new TomcatContextCustomizer() {
+                    @Override
+                    public void customize(Context context) {
+                        setTomcatContext(context);
+                    }
+                };
+                List<TomcatContextCustomizer> contextCustomizers = new ArrayList<>();
+                contextCustomizers.add(contextCustomizer);
+                serverFactory.setTomcatContextCustomizers(contextCustomizers);
+
+                // Tomcat valve used to redirect root URL (/) to real application URL (/midpoint/).
+                // See comments in TomcatRootValve
+                Valve rootValve = new TomcatRootValve(servletPath);
+                serverFactory.addEngineValves(rootValve);
+
+                Valve nodeIdHeaderValve = new NodeIdHeaderValve(taskManager);
+                serverFactory.addEngineValves(nodeIdHeaderValve);
             }
         }
-
-        private void customizeTomcat(TomcatServletWebServerFactory tomcatFactory) {
-            // set tomcat context.
-            TomcatContextCustomizer contextCustomizer = new TomcatContextCustomizer() {
-                @Override
-                public void customize(Context context) {
-                    setTomcatContext(context);
-                }
-            };
-            List<TomcatContextCustomizer> contextCustomizers = new ArrayList<>();
-            contextCustomizers.add(contextCustomizer);
-            tomcatFactory.setTomcatContextCustomizers(contextCustomizers);
-
-            // Tomcat valve used to redirect root URL (/) to real application URL (/midpoint/).
-            // See comments in TomcatRootValve
-            Valve rootValve = new TomcatRootValve(servletPath);
-            tomcatFactory.addEngineValves(rootValve);
-
-            Valve nodeIdHeaderValve = new NodeIdHeaderValve(taskManager);
-            tomcatFactory.addEngineValves(nodeIdHeaderValve);
-
-            if (useForwardHeaders) {
-                RemoteIpValve remoteIpValve = new RemoteIpValve();
-                if (StringUtils.isNotEmpty(internalProxies)) {
-                    remoteIpValve.setInternalProxies(internalProxies);
-                }
-                if (StringUtils.isNotEmpty(protocolHeader)) {
-                    remoteIpValve.setProtocolHeader(protocolHeader);
-                }
-                if (StringUtils.isNotEmpty(protocolHeaderHttpsValue)) {
-                    remoteIpValve.setProtocolHeaderHttpsValue(protocolHeaderHttpsValue);
-                }
-                if (StringUtils.isNotEmpty(portHeader)) {
-                    remoteIpValve.setPortHeader(portHeader);
-                }
-                tomcatFactory.addEngineValves(remoteIpValve);
-            }
-        }
-
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java
index 972458b5ed0..3afc9f23eba 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java
@@ -29,8 +29,6 @@ public class DropDownChoicePanel<T> extends InputPanel {
     private static final long serialVersionUID = 1L;
     private static final String ID_INPUT = "input";
 
-    private boolean sortChoices = true;
-
     public DropDownChoicePanel(String id, IModel<T> model, IModel<? extends List<? extends T>> choices) {
         this(id, model, choices, false);
     }
@@ -66,16 +64,6 @@ protected String getNullValidDisplayValue() {
                 return DropDownChoicePanel.this.getNullValidDisplayValue();
             }
 
-            @Override
-            public IModel<? extends List<? extends T>> getChoicesModel() {
-                IModel<? extends List<? extends T>> choices = super.getChoicesModel();
-                if (sortChoices) {
-                    return Model.ofList(WebComponentUtil.sortDropDownChoices(choices, renderer));
-                } else {
-                    return choices;
-                }
-            }
-
             @Override
             public String getModelValue() {
                 T object = this.getModelObject();
@@ -108,12 +96,4 @@ public IModel<T> getModel() {
     protected String getNullValidDisplayValue() {
         return getString("DropDownChoicePanel.notDefined");
     }
-
-    public boolean isSortChoices() {
-        return sortChoices;
-    }
-
-    public void setSortChoices(boolean sortChoices) {
-        this.sortChoices = sortChoices;
-    }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageTraceView.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageTraceView.java
index 8b50d28bddd..4341dcd26ec 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageTraceView.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageTraceView.java
@@ -116,7 +116,6 @@ private void initLayout() {
                 GenericTraceVisualizationType.class, ID_CLOCKWORK_EXECUTION, createClockworkLevels(),
                 new PropertyModel<>(model, TraceViewDto.F_CLOCKWORK_EXECUTION),
                 this, false);
-        clockworkExecutionChoice.setSortChoices(false);
         clockworkExecutionChoice.setOutputMarkupId(true);
         mainForm.add(clockworkExecutionChoice);
 
@@ -124,7 +123,6 @@ GenericTraceVisualizationType.class, ID_CLOCKWORK_EXECUTION, createClockworkLeve
                 GenericTraceVisualizationType.class, ID_CLOCKWORK_CLICK, createClockworkLevels(),
                 new PropertyModel<>(model, TraceViewDto.F_CLOCKWORK_CLICK),
                 this, false);
-        clockworkClickChoice.setSortChoices(false);
         clockworkClickChoice.setOutputMarkupId(true);
         mainForm.add(clockworkClickChoice);
 
@@ -132,7 +130,6 @@ GenericTraceVisualizationType.class, ID_CLOCKWORK_CLICK, createClockworkLevels()
                 GenericTraceVisualizationType.class, ID_MAPPING_EVALUATION, createMappingLevels(),
                 new PropertyModel<>(model, TraceViewDto.F_MAPPING_EVALUATION),
                 this, false);
-        mappingEvaluationChoice.setSortChoices(false);
         mappingEvaluationChoice.setOutputMarkupId(true);
         mainForm.add(mappingEvaluationChoice);
 
@@ -140,7 +137,6 @@ GenericTraceVisualizationType.class, ID_MAPPING_EVALUATION, createMappingLevels(
                 GenericTraceVisualizationType.class, ID_FOCUS_LOAD, createStandardLevels(),
                 new PropertyModel<>(model, TraceViewDto.F_FOCUS_LOAD),
                 this, false);
-        focusLoadChoice.setSortChoices(false);
         focusLoadChoice.setOutputMarkupId(true);
         mainForm.add(focusLoadChoice);
 
@@ -148,7 +144,6 @@ GenericTraceVisualizationType.class, ID_FOCUS_LOAD, createStandardLevels(),
                 GenericTraceVisualizationType.class, ID_PROJECTION_LOAD, createStandardLevels(),
                 new PropertyModel<>(model, TraceViewDto.F_PROJECTION_LOAD),
                 this, false);
-        projectionLoadChoice.setSortChoices(false);
         projectionLoadChoice.setOutputMarkupId(true);
         mainForm.add(projectionLoadChoice);
 
@@ -156,7 +151,6 @@ GenericTraceVisualizationType.class, ID_PROJECTION_LOAD, createStandardLevels(),
                 GenericTraceVisualizationType.class, ID_FOCUS_CHANGE, createStandardLevels(),
                 new PropertyModel<>(model, TraceViewDto.F_FOCUS_CHANGE),
                 this, false);
-        focusChangeChoice.setSortChoices(false);
         focusChangeChoice.setOutputMarkupId(true);
         mainForm.add(focusChangeChoice);
 
@@ -164,7 +158,6 @@ GenericTraceVisualizationType.class, ID_FOCUS_CHANGE, createStandardLevels(),
                 GenericTraceVisualizationType.class, ID_PROJECTION_CHANGE, createStandardLevels(),
                 new PropertyModel<>(model, TraceViewDto.F_PROJECTION_CHANGE),
                 this, false);
-        projectionChangeChoice.setSortChoices(false);
         projectionChangeChoice.setOutputMarkupId(true);
         mainForm.add(projectionChangeChoice);
 
@@ -172,7 +165,6 @@ GenericTraceVisualizationType.class, ID_PROJECTION_CHANGE, createStandardLevels(
                 GenericTraceVisualizationType.class, ID_OTHERS, createOthersLevels(),
                 new PropertyModel<>(model, TraceViewDto.F_OTHERS),
                 this, false);
-        otherChoice.setSortChoices(false);
         otherChoice.setOutputMarkupId(true);
         mainForm.add(otherChoice);
 
diff --git a/infra/schema/pom.xml b/infra/schema/pom.xml
index 3de7a7499c6..74fc9fa6516 100644
--- a/infra/schema/pom.xml
+++ b/infra/schema/pom.xml
@@ -273,6 +273,11 @@
                                     </extraargs>
                                 </wsdlOption>
                             </wsdlOptions>
+                            <!--
+                            This avoids going online for schema checking which may slow down the build sometimes extremely,
+                            e.g. when firewall is set to drop SYN packet silently during connection.
+                            -->
+                            <additionalJvmArgs>-Dcom.sun.tools.xjc.api.impl.s2j.SchemaCompilerImpl.noCorrectnessCheck=true</additionalJvmArgs>
                         </configuration>
                         <goals>
                             <goal>wsdl2java</goal>
diff --git a/model/certification-impl/pom.xml b/model/certification-impl/pom.xml
index 4cb4c1e9ec2..b1c7d6b70fb 100644
--- a/model/certification-impl/pom.xml
+++ b/model/certification-impl/pom.xml
@@ -267,7 +267,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency> <!-- needed as runtime dependency otherwise spring won't start -->
diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml
index 171bc5fc36f..eba94b78ed4 100644
--- a/model/model-api/pom.xml
+++ b/model/model-api/pom.xml
@@ -100,7 +100,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
index 50f314564cc..368b6f4a840 100644
--- a/model/model-impl/pom.xml
+++ b/model/model-impl/pom.xml
@@ -386,7 +386,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <!-- TODO: compile scope for ModelRestService - I think it should go to more infrastructural module (Virgo) -->
             <!--<scope>test</scope>-->
         </dependency>
diff --git a/model/model-intest/pom.xml b/model/model-intest/pom.xml
index 90b64c485f8..369a3f1ffd5 100644
--- a/model/model-intest/pom.xml
+++ b/model/model-intest/pom.xml
@@ -267,7 +267,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/model/model-test/pom.xml b/model/model-test/pom.xml
index d6840880848..b7520d82184 100644
--- a/model/model-test/pom.xml
+++ b/model/model-test/pom.xml
@@ -182,7 +182,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.forgerock.opendj</groupId>
diff --git a/model/notifications-impl/pom.xml b/model/notifications-impl/pom.xml
index 6fca413f07c..04212cfa577 100644
--- a/model/notifications-impl/pom.xml
+++ b/model/notifications-impl/pom.xml
@@ -236,7 +236,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/model/report-impl/pom.xml b/model/report-impl/pom.xml
index 88f6f288d52..f2f99dee17f 100644
--- a/model/report-impl/pom.xml
+++ b/model/report-impl/pom.xml
@@ -298,7 +298,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/model/workflow-impl/pom.xml b/model/workflow-impl/pom.xml
index d3ffd2fc75a..59e077674fb 100644
--- a/model/workflow-impl/pom.xml
+++ b/model/workflow-impl/pom.xml
@@ -282,7 +282,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency> <!-- needed as runtime dependency otherwise spring won't start -->
diff --git a/pom.xml b/pom.xml
index 28e99391c51..3608a92f44e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -537,7 +537,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-configuration2</artifactId>
-                <version>2.6</version>
+                <version>2.7</version>
                 <exclusions>
                     <!-- replaced by org.slf4j:jcl-over-slf4j -->
                     <exclusion>
@@ -605,8 +605,8 @@
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>4.0.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -1826,6 +1826,9 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>2.8.2</version>
+                    <configuration>
+                        <deployAtEnd>true</deployAtEnd>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
diff --git a/repo/security-api/pom.xml b/repo/security-api/pom.xml
index 68f57f9d8fb..7e37520af67 100644
--- a/repo/security-api/pom.xml
+++ b/repo/security-api/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/repo/security-enforcer-api/pom.xml b/repo/security-enforcer-api/pom.xml
index 59f746617ad..9e9dc7c71e6 100644
--- a/repo/security-enforcer-api/pom.xml
+++ b/repo/security-enforcer-api/pom.xml
@@ -53,7 +53,7 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/testing/conntest/pom.xml b/testing/conntest/pom.xml
index d6f4ae4e7db..8c69dfb3896 100644
--- a/testing/conntest/pom.xml
+++ b/testing/conntest/pom.xml
@@ -1,239 +1,239 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
-  ~
-  ~ This work is dual-licensed under the Apache License 2.0
-  ~ and European Union Public License. See LICENSE file for details.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <artifactId>testing</artifactId>
-        <groupId>com.evolveum.midpoint.testing</groupId>
-        <version>4.1.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>conntest</artifactId>
-
-    <name>midPoint Testing - Resource Connection Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.evolveum.midpoint.infra</groupId>
-            <artifactId>util</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.infra</groupId>
-            <artifactId>schema</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.infra</groupId>
-            <artifactId>prism-api</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.infra</groupId>
-            <artifactId>prism-impl</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.infra</groupId>
-            <artifactId>common</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>repo-api</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>task-api</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.provisioning</groupId>
-            <artifactId>provisioning-api</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.model</groupId>
-            <artifactId>model-api</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.model</groupId>
-            <artifactId>model-impl</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.model</groupId>
-            <artifactId>model-test</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.provisioning</groupId>
-            <artifactId>provisioning-impl</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.provisioning</groupId>
-            <artifactId>ucf-impl-builtin</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>task-quartz-impl</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>audit-impl</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>security-enforcer-impl</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>security-impl</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>repo-common</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>repo-test-util</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.api</groupId>
-            <artifactId>api-all</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-
-        <!-- TEST dependency -->
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.tools</groupId>
-            <artifactId>test-ng</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.polygon</groupId>
-            <artifactId>connector-ldap</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <!-- Needed otherwise the JDK14 SLF4J binding can override the midpoint's logback binding -->
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-jdk14</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.polygon</groupId>
-            <artifactId>connector-powershell</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.polygon</groupId>
-            <artifactId>connector-databasetable</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.infra</groupId>
-            <artifactId>test-util</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>repo-sql-impl</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint</groupId>
-            <artifactId>midpoint-localization</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>repo-sql-impl-test</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aspects</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>system-init</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- Doesn't have any unit tests, only integration. -->
-                    <skip>true</skip>
-                    <runOrder>alphabetical</runOrder>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <skipTests>${skipConnTests}</skipTests>
-                    <runOrder>alphabetical</runOrder>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>testing</artifactId>
+        <groupId>com.evolveum.midpoint.testing</groupId>
+        <version>4.1.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>conntest</artifactId>
+
+    <name>midPoint Testing - Resource Connection Tests</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.evolveum.midpoint.infra</groupId>
+            <artifactId>util</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.infra</groupId>
+            <artifactId>schema</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.infra</groupId>
+            <artifactId>prism-api</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.infra</groupId>
+            <artifactId>prism-impl</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.infra</groupId>
+            <artifactId>common</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>repo-api</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>task-api</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.provisioning</groupId>
+            <artifactId>provisioning-api</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.model</groupId>
+            <artifactId>model-api</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.model</groupId>
+            <artifactId>model-impl</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.model</groupId>
+            <artifactId>model-test</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.provisioning</groupId>
+            <artifactId>provisioning-impl</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.provisioning</groupId>
+            <artifactId>ucf-impl-builtin</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>task-quartz-impl</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>audit-impl</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>security-enforcer-impl</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>security-impl</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>repo-common</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>repo-test-util</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.directory.api</groupId>
+            <artifactId>api-all</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+
+        <!-- TEST dependency -->
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.tools</groupId>
+            <artifactId>test-ng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.polygon</groupId>
+            <artifactId>connector-ldap</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <!-- Needed otherwise the JDK14 SLF4J binding can override the midpoint's logback binding -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-jdk14</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.polygon</groupId>
+            <artifactId>connector-powershell</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.polygon</groupId>
+            <artifactId>connector-databasetable</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.infra</groupId>
+            <artifactId>test-util</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>repo-sql-impl</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint</groupId>
+            <artifactId>midpoint-localization</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>repo-sql-impl-test</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>system-init</artifactId>
+            <version>4.1.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Doesn't have any unit tests, only integration. -->
+                    <skip>true</skip>
+                    <runOrder>alphabetical</runOrder>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skipConnTests}</skipTests>
+                    <runOrder>alphabetical</runOrder>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/testing/longtest/pom.xml b/testing/longtest/pom.xml
index 5c10e31624b..0f9258719dd 100644
--- a/testing/longtest/pom.xml
+++ b/testing/longtest/pom.xml
@@ -204,7 +204,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml
index 11212d8dbbf..0ff0ffe5019 100644
--- a/testing/rest/pom.xml
+++ b/testing/rest/pom.xml
@@ -236,7 +236,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/testing/sanity/pom.xml b/testing/sanity/pom.xml
index 7deb39c686a..9a10345d273 100644
--- a/testing/sanity/pom.xml
+++ b/testing/sanity/pom.xml
@@ -225,7 +225,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency> <!-- needed as runtime dependency otherwise spring won't start -->
diff --git a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java
index 6a3cd6bf98a..b1cf313b93f 100644
--- a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java
+++ b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java
@@ -150,7 +150,7 @@ public ResourceShadowTable getShadowTable(String resourceName, String searchedIt
             tab.clickSearchInResource();
         }
         Selenide.sleep(1000);
-        if (intent != null && !intent.isBlank()) {
+        if (intent != null && !intent.isEmpty()) {
             tab.setIntent(intent);
             Selenide.sleep(MidPoint.TIMEOUT_DEFAULT_2_S);
         }
diff --git a/testing/story/pom.xml b/testing/story/pom.xml
index 7d0eea54cd6..eb529da1420 100644
--- a/testing/story/pom.xml
+++ b/testing/story/pom.xml
@@ -272,7 +272,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>