Merged debian/* with 5.5.36 master
Small fixes after diffing to MariaDB 5.5.36 Debian official packaging