Merge remote-tracking branch 'origin/release_22_2_0' into fix/CB-2500/loader-cancel

Author: Wroud

webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts

@@ -237,9 +237,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
 
     tempConfig.description = state.config.description;
 
-    if (state.projectId === PROJECT_GLOBAL_ID) {
-      tempConfig.template = state.config.template;
-    }
+    tempConfig.template = state.projectId === PROJECT_GLOBAL_ID ? state.config.template : false;
 
     tempConfig.driverId = state.config.driverId;