Backport two commits for MDEV-28177 and MDEV-28429#3

keeper wants to merge 2 commits intoaws:mysql-8.0aws/audit-plugin-for-mysql:mysql-8.0from

keeper:MDEV-28177-MDEV-28429-backportkeeper/audit-plugin-for-mysql:MDEV-28177-MDEV-28429-backportCopy head branch name to clipboard