Merge 2.11.5 back into main branch#1201

majanjua-amzn merged 3 commits intomainaws-observability/aws-otel-java-instrumentation:mainfrom

adap-to-mainaws-observability/aws-otel-java-instrumentation:adap-to-mainCopy head branch name to clipboard