Merge branch 'master' into 'master'

Update libmariadb-dev.links to restore /usr/include/mysql compatibility...

See merge request mariadb-team/mariadb-10.3!8