Merge pull request #9728 from padelsbach/aia-updates #4764

Job	Run time
make check (--verbose --enable-all --disable-all-osp --disable-opensslall --enable-opensslcoexist...	2m 13s
make check (--verbose --enable-all --disable-all-osp --disable-opensslall --enable-opensslcoexist...	2m 1s
	4m 14s

Provide feedback