#72 merge mariadb 5.5 changes 3808 (MDEV-4578) and 3821 (MDEV-4683)