Cherry pick 7086#7134

Fred1155 merged 2 commits into

masteraws/aws-sdk-java-v2:masterfrom

bole/cherry_pick_7086aws/aws-sdk-java-v2:bole/cherry_pick_7086Copy head branch name to clipboard