rebase on master

Signed-off-by: tvallin <[email protected]>

Author: tvallin

archetypes/helidon/src/main/archetype/common/observability.xml

@@ -156,7 +156,6 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                                     </list>
                                     <list key="Main-routing-builder" if="${flavor} == 'se'">
                                         <value><![CDATA[.addFeature(ObserveFeature.create(MetricsObserver.create()))]]></value>
-                                        <value><![CDATA[.register("/metrics-greet", metricsService)]]></value>
                                     </list>
                                     <list key="GreetService-imports" if="${flavor} == 'se'">
                                         <value>io.helidon.metrics.api.Metrics</value>
@@ -523,7 +522,7 @@ curl -s -X GET http://localhost:8080/health
                                                             .status(isStarted())
                                                             .detail("time", System.currentTimeMillis())
                                                             .build(), HealthCheckType.STARTUP)
-                                                    .build()))]]></value>
+                                                    .build())]]></value>
                                 </list>
                                 <list key="Main-helidon-imports" if="${flavor} == 'se'">
                                     <value>io.helidon.health.HealthCheckResponse</value>