1.2.33 release branch back to develop (#597)

Author: haniotak

backend/src/test/java/net/es/oscars/cuke/MockSimpleConnectionHelper.java

@@ -496,7 +496,9 @@ public Connection generateMockConnection(String mockConnectionId, Phase phase, B
     }
     public Connection generateMockConnection(String mockConnectionId, Phase phase, BuildMode buildMode, State state, DeploymentState deploymentState, DeploymentIntent deploymentIntent, int connection_mtu, String projectId) {
         Set<String> projectIds = new HashSet<>();
-        projectIds.add(projectId);
+        if (projectId != null) {
+            projectIds.add(projectId);
+        }
 
         return Connection.builder()
             .id(1L)