Merge pull request #11004 from rabbitmq/mergify/bp/v3.13.x/pr-10952

OAuth 2 client: refactor code related to how final TLS options are computed (backport #10952)

Author: michaelklishin