rebase and test fixes

Author: Łukasz Bigorajski

designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DefinitionResourcesSpec.scala

@@ -285,7 +285,7 @@ class DefinitionResourcesSpec
         parameters.map(_.hcursor.downField("expression").downField("expression").focus.value.asString.value)
       initialExpressions shouldEqual List(
         "'fooValueFromConfig'",
-        "'barValueFromProviderCode'",
+        "barValueFromProviderCode",
         "'fooValueFromConfig' + '-' + 'barValueFromProviderCode'"
       )
     }

engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicMultipleParamsService.scala

@@ -1,6 +1,6 @@
 package pl.touk.nussknacker.engine.management.sample.service
 
-import pl.touk.nussknacker.engine.api.{Context, EagerService, NodeId, Params, ServiceInvoker, TemplateEvaluationResult}
+import pl.touk.nussknacker.engine.api.{Context, EagerService, NodeId, Params, ServiceInvoker}
 import pl.touk.nussknacker.engine.api.context.ValidationContext
 import pl.touk.nussknacker.engine.api.context.transformation.{
   DefinedEagerParameter,
@@ -47,14 +47,14 @@ object DynamicMultipleParamsService extends EagerService with SingleInputDynamic
     case TransformationStep(
           (ParameterName("foo"), DefinedEagerParameter(fooValue, _)) :: (
             ParameterName("bar"),
-            DefinedEagerParameter(barValue: TemplateEvaluationResult, _)
+            DefinedEagerParameter(barValue: String, _)
           ) :: Nil,
           _
         ) =>
       NextParameters(
         List(
           Parameter(ParameterName("baz"), Typed[String])
-            .copy(defaultValue = Some(Expression.spel(s"'$fooValue' + '-' + '${barValue.renderedTemplate}''")))
+            .copy(defaultValue = Some(Expression.spel(s"'$fooValue' + '-' + '$barValue'")))
         )
       )
     case TransformationStep(