Fix the task application metrics tag expression

 Resolves #4437
 Resolves #4299

 * fix affected test fixtures.

(cherry picked from commit a069fec)

Author: tzolov

spring-cloud-dataflow-server-core/src/main/resources/META-INF/application-task-common-properties-defaults.yml

@@ -2,7 +2,7 @@ common:
   management:
     metrics:
       tags:
-        application: ${task.name:unknown}-${task.execution.id:unknown}
+        application: ${spring.cloud.task.name:unknown}-${spring.cloud.task.executionid:unknown}
         service: "task-application"
 
 local:

spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskSchedulerControllerTests.java

@@ -210,7 +210,7 @@ private void createAndVerifySchedule(String scheduleName, String createdSchedule
 				"\"taskDefinitionProperties\":{\"management.metrics.tags.service\":\"task-application\"," +
 				"\"spring.datasource.username\":null,\"spring.datasource.url\":null," +
 				"\"spring.datasource.driverClassName\":null," +
-				"\"management.metrics.tags.application\":\"${task.name:unknown}-${task.execution.id:unknown}\"," +
+				"\"management.metrics.tags.application\":\"${spring.cloud.task.name:unknown}-${spring.cloud.task.executionid:unknown}\"," +
 				"\"spring.cloud.task.name\":\"testDefinition\"}," +
 				"\"deploymentProperties\":{}}", auditRecord.getAuditData());
 	}
@@ -223,7 +223,7 @@ public void testCreateScheduleWithSensitiveFields() throws Exception {
 						"\"taskDefinitionProperties\":{\"management.metrics.tags.service\":\"task-application\"," +
 						"\"prop1\":\"foo\",\"spring.datasource.username\":null,\"prop2.secret\":\"******\"," +
 						"\"spring.datasource.url\":null,\"spring.datasource.driverClassName\":null," +
-						"\"management.metrics.tags.application\":\"${task.name:unknown}-${task.execution.id:unknown}\"," +
+						"\"management.metrics.tags.application\":\"${spring.cloud.task.name:unknown}-${spring.cloud.task.executionid:unknown}\"," +
 						"\"spring.cloud.task.name\":\"testDefinition\"}," +
 						"\"deploymentProperties\":{\"spring.cloud.deployer.prop1.secret\":\"******\"," +
 						"\"spring.cloud.deployer.prop2.password\":\"******\"}}",
@@ -239,7 +239,7 @@ public void testCreateScheduleCommaDelimitedArgs() throws Exception {
 						"\"taskDefinitionProperties\":{\"management.metrics.tags.service\":\"task-application\"," +
 						"\"prop1\":\"foo\",\"spring.datasource.username\":null,\"prop2.secret\":\"******\"," +
 						"\"spring.datasource.url\":null,\"spring.datasource.driverClassName\":null," +
-						"\"management.metrics.tags.application\":\"${task.name:unknown}-${task.execution.id:unknown}\"," +
+						"\"management.metrics.tags.application\":\"${spring.cloud.task.name:unknown}-${spring.cloud.task.executionid:unknown}\"," +
 						"\"spring.cloud.task.name\":\"testDefinition\"}," +
 						"\"deploymentProperties\":{\"spring.cloud.deployer.prop1.secret\":\"******\"," +
 						"\"spring.cloud.deployer.prop2.password\":\"******\"}}",