Merge "Replace mysql connector with MariaDB connector"