On the multiple_ssl_impls branch: Merge trunk up to r2024. Revs 2022 and 2023 were already merged manually, so this revision only records the merged revisions.