Merge remote-tracking branch 'origin/failsafe-3.0-javaagent' into failsafe-3.0-javaagent

# Conflicts:
#	instrumentation/failsafe-3.0/library/src/test/java/io/opentelemetry/instrumentation/failsafe/v3_0/FailsafeTelemetryTest.java

Author: trask