Merge "Change mysql to mariadb connector"