Merge remote-tracking branch 'origin/create-tags-based-on-method-resu…

…lt' into create-tags-based-on-method-result

# Conflicts:
#	micrometer-core/src/main/java/io/micrometer/core/aop/CountedAspect.java
#	micrometer-core/src/main/java/io/micrometer/core/aop/TimedAspect.java
#	samples/micrometer-samples-spring-framework6/src/test/java/io/micrometer/samples/spring6/aop/CountedAspectTest.java
#	samples/micrometer-samples-spring-framework6/src/test/java/io/micrometer/samples/spring6/aop/TimedAspectTest.java